makefile
Merge branch 'master' of https://github.com/shaojing1779/ftp.git

Conflicts:
	.cproject