Merge branch 'Group-Meeting-August-12'
Merge branch 'Greeson-workspace'
Merge branch 'master' of https://github.com/srophe/manuscripts