Added more parse objects
Merge branch 'master' of github.com:og7593/MHacks-Android
Update master branch