blub
blub
Merge branch 'master' of https://github.com/floatec/Mini-mal-listic

Conflicts:
	MiniMalIstic/src/com/gamelab/mmi/GameScreen.java