Pushing final server stuff
Merge branch 'master' of git@github.com:bxie94/201-Team-Project.git