uploading works at the end of the application
Merge github.com:ldanielw1/cs160-mSpray
Merge github.com:ldanielw1/cs160-mSpray

Conflicts:
	AndroidManifest.xml