Blabla blubb
Merge branch 'master' of ssh://git@github.com/superduali/ClappyBit.git

Conflicts:
	ClappyBit/src/ClappyBit/Controller/Main.java
Merge branch 'master' of ssh://git@github.com/superduali/ClappyBit.git