Updated Server
Merge pull request #3 from dillonhale/master

Updated Server