Finished merge with 307

This commit is contained in:
Heath Volmer 2017-08-22 10:48:27 -06:00
commit 85c2c448d1
21 changed files with 1503 additions and 821 deletions