Ignore commit
Ignore commit
Merge branch 'master' of https://github.com/HorsesInSpace/Horses-in-Space

Conflicts:
	Horses-in-Space core/.classpath
	Horses-in-Space core/.project
	Horses-in-Space core/build.gradle
	Horses-in-Space core/src/MyHorseGame.gwt.xml
	Horses-in-Space core/src/com/HiS/game/MyHorseGame.java
	Horses-in-Space core/src/com/HiS/hishelpers/InputHandler.java
	Horses-in-Space-core/.classpath
	Horses-in-Space-core/.project
	Horses-in-Space-core/build.gradle
	Horses-in-Space-core/src/MyHorseGame.gwt.xml
	Horses-in-Space-core/src/com/HiS/game/MyHorseGame.java
	Horses-in-Space-core/src/com/HiS/hishelpers/InputHandler.java
	Horses-in-Space-desktop/.classpath
	Horses-in-Space-html/.classpath
	Horses-in-Space-ios/.classpath
	core/.classpath
	core/.project
	core/build.gradle
	core/src/MyHorseGame.gwt.xml
	core/src/com/HiS/game/MyHorseGame.java
	core/src/com/HiS/hishelpers/InputHandler.java
Made changes in .gitignore to ignore contents of Horses-in-Space-android/gen/