Steps count start screen
start screen
Merge branch 'master' of https://github.com/rianna90/MegaMan

Conflicts:
	my-gdx-game/src/com/me/mygdxgame/MyGdxGame.java

#heisenberg
ios update
Afbeeldingen
Merge remote-tracking branch 'origin/HEAD' into Abby

Conflicts:
	.DS_Store
Juiste bg + splash
Game met coins
Menu's fixed
assets java jpg ios
merge