ome shity shit
Merge branch 'master' of github.com:floatec/Mini-mal-listic

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