Signed-off-by: Pontus <flash13records@gmail.com>
Merge branch 'master' of https://github.com/PontusWirsching/MinersOfAragos.git
Signed-off-by: Pontus <flash13records@gmail.com>
Merge branch 'master' of
https://github.com/PontusWirsching/MinersOfAragos.git

Conflicts:
	src/core/game/Game.java
	src/core/game/Start.java
	src/core/tools/TextureLoader.java