Cleaned up Client and Server a bit.
Merge branch 'master' of https://github.com/brodypainter/FinalProject