modify code upload and update resume
Merge branch 'master' of https://github.com/viettd56/CSU

Conflicts:
	Server/server.c