hrhr
Merge branch 'develop' of https://github.com/Krill/red-elephant.git into
develop

Conflicts:
	src/Engine/GameEngine.java
Merge branch 'develop' of https://github.com/Krill/red-elephant.git into develop