add FreeDisk/FreeMem in server.cpp
Merge branch 'master' of https://github.com/wmin0/Doopey

Conflicts:
	src/machine/Server.cpp