Merge pull request #314 from ucb-bar/master

`master` fixes into `dev`
This commit is contained in:
Abraham Gonzalez
2019-10-18 21:05:29 -04:00
committed by GitHub
6 changed files with 50 additions and 75 deletions