Tester
trying these new files
Merge branch 'master' of github.com:ldanielw1/cs160-mSpray
Merge branch 'master' of github.com:ldanielw1/cs160-mSpray
completed connection to GetGps
Merge branch 'master' of github.com:ldanielw1/cs160-mSpray

Conflicts:
	res/layout/add_sprayer.xml
	src/edu/berkeley/cs160/mSpray/MSpray.java