Added back all the lost May 9-10th commits for hopefully the last damn time!
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp