Started implementing game play
Merge branch 'dev'