commit
commit
Merge branch 'master' of https://github.com/kinxz/Canopus.git

Conflicts:
	Canopus/.project
	Canopus/assets/.DS_Store
	Canopus/assets/textures/.DS_Store
	Canopus/canopus/src/de/datpixelstudio/canopus/inputHandler/GameInputHandler.java
	Canopus/canopus/src/de/datpixelstudio/canopus/states/GameState.java
	Canopus/canopus/src/de/datpixelstudio/canopus/states/MenueState.java
Fails