Adding my branch
Update
Merged Master and Grant
Fix Merge
Merging again lol
Set up framework for the activities
Removed some extra merge files
Merge branch 'master' of https://github.com/gcs278/zonesnap.git into
brad

Conflicts:
	AndroidManifest.xml
	res/values-v11/styles.xml
	res/values/attrs.xml
	res/values/colors.xml
	res/values/strings.xml
	res/values/styles.xml