Modified Client
  -upload should work now
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/matthew/databox/Client.java