server ver 2
Merge branch 'master' of https://github.com/Vincentvjj/info343Final

 the commit.