merge
Merge branch 'server_release' of https://github.com/adiagarwalla/cos333 into server_release

merge
makefile for simple cleans