Basic move of game logic to the turn state complete, further refactoring of the code in progress.
All public methods beloging to GameLogic except for Run have been move to the Turn abstract class.
Turn change logic slightly modified as a result.
Code merge fix.