Main and Controller refactoring
Merge branch 'master' of ssh://git@github.com/superduali/ClappyBit.git