adding Server
Merge branch 'master' of https://github.com/smcadams86/robot-control