more changes
merging

Merge branch 'master' of https://github.com/ryanstrat/MHacksIV
Merge branch 'master' of https://github.com/ryanstrat/MHacksIV
Merge branch 'master' of https://github.com/ryanstrat/MHacksIV