file uploads

random files
Merge remote-tracking branch 'origin/master'

Conflicts:
	Departure/.classpath
	Departure/bin/AndroidManifest.xml
Revert "file uploads"

This reverts commit 1146651ae1bbcdfaf74545305f5d50fa33d8e0a2.