actual game play
Merge branch 'master' of https://github.com/tavor/proj1