Merge pull request #3 from thijstriemstra/master

Moved old game logic into view
Merge remote-tracking branch 'upstream/master'