Xincheng
Merge branch 'master' of https://github.com/zadbee/GoTechTask15

Conflicts:
	build/classes/.gitignore
	build/classes/controller/UploadAction.class