addDownloader
Merge branch 'master' of https://github.com/yaoxisheng/VE489_project

Conflicts:
	server
	server.cpp