Graphical client and server WIP
Merge branch 'master' of https://github.com/defianc3/Team35