testing gitflow and restructuring
more restructuring
removed code seperating client and server components
Merge pull request #5 from nickg047/feature/gameLogic

Feature/consolidate