Merge branch 'controller'
Get rid of abstract classes Cell and Player
Merge branch 'master' into controller