added "make all" option to Makefile
makefile changed and I don't know what else
Merge branch 'master' of https://github.com/mehansen/cs118_project2

Conflicts:
	server.cpp