Server update
Merge branch 'master' of github.com:gfink/project2CSCE315v2