Server stuff
Merge branch 'master' of https://github.com/bchau/CP372
Merge branch 'master' of https://github.com/bchau/CP372
cleaning up server