removed some unnecessary code
apparently I changed the project properties file?
Merge branch 'master' of https://github.com/gcs278/zonesnap.git into
brad

Conflicts:
	project.properties
	src/com/zonesnap/activities/MainActivity.java
updating the strings file to eliminate errors