AddedReecesChanges
Merge branch 'master' of https://github.com/nhurwitz/GroupGoal.git

Conflicts:
	GroupGoal/AndroidManifest.xml
	GroupGoal/bin/AndroidManifest.xml
	GroupGoal/bin/GroupGoal.apk
	GroupGoal/bin/R.txt
	GroupGoal/bin/classes.dex
	GroupGoal/bin/classes/.gitignore
	GroupGoal/bin/resources.ap_
	GroupGoal/gen/.gitignore
	GroupGoal/project.properties
	GroupGoal/res/menu/main.xml
	GroupGoal/res/values/strings.xml
	GroupGoal/src/com/cs121/groupgoal/MainActivity.java
Adding files and stuff