adding file
permissions in the manifest
commiting my files
merged changes
merging conflicts and adding new files
manifest changes
merging manifest
work on chores + animations
Merge branch 'master' of https://github.com/pcsmits/homebase

Conflicts:
	root/homeBase/res/values/ids.xml
chore info stuff
hooking gps with parse
Merging from upstream
Merge branch 'master' of https://github.com/MaritalWheat/homebase
added newsfeed, and proper flow for accessing modules from newsfeed (currently has chores hooked up)
worked on newsfeed
hooking gps with parse
Parse connected to gps
Merge branch 'master' of https://github.com/MaritalWheat/homebase
Merge pull request #14 from pcsmits/master

adding gps methods to parse class
Merge branch 'master' of https://github.com/MaritalWheat/homebase
added TODOs and merge parse classes
newsfeed updates