done with main game logic pre-debugging
Merge pull request #5 from JSConnolly/gamelogic

done with main game logic pre-debugging