added uploadfunction
setup
Merge branch 'develop' of https://github.com/Jather90/AMOS_proj5 into develop

Conflicts:
	.classpath
	.settings/org.eclipse.wst.common.component