fixed server build on windows
Merge branch 'master' of github.com:atiti/AirTame

Conflicts:
	server/Makefile