changed drawing
Merge branch 'master' of https://github.com/mheAC/SchulprojektAE.git

Conflicts:
	src/gui/JGameSquare.java
Merge branch 'master' of https://github.com/mheAC/SchulprojektAE.git
Merge branch 'master' of https://github.com/mheAC/SchulprojektAE.git
basic colision detection
Merge branch 'master' of https://github.com/mheAC/SchulprojektAE.git

Conflicts:
	bin/engine/GameGrid.class