Update for Client and Server
Merge pull request #2 from dillonhale/master

Update for Client and Server