Merge pull request #1 from GA-WDI-August-Team-Charmander/master

Server
Merge pull request #5 from im11041991/master

server