Use state system
Merge branch 'master' of https://github.com/immobilis/tetrix.git
Remove file created in error