Game logic and reorganisation
Merge pull request #17 from dreamteam69/master

Game logic and reorganisation