update
Commit zoveel
Helemaal SCHLA!
sound etc.
bla
bbla
Added the new Openingscreen :D
commit all changes
bla
Merge branch 'master' of https://github.com/loljimmo12/Stijgmachine into spel1

Conflicts:
	src/stijgmachine/jti1a1/nl/controller/Main.java
	src/stijgmachine/jti1a1/nl/view/MiniGameView.java
Merge branch 'master' of https://github.com/loljimmo12/Stijgmachine into spel1

Conflicts:
	src/stijgmachine/jti1a1/nl/controller/Main.java
	src/stijgmachine/jti1a1/nl/view/MiniGameView.java
Fixed switching view

Merge branch 'SteamGame' of https://github.com/loljimmo12/Stijgmachine into final

Conflicts:
	src/stijgmachine/jti1a1/nl/controller/Main.java
Merge branch 'lasstation' of https://github.com/loljimmo12/Stijgmachine into final

Conflicts:
	.classpath
	src/stijgmachine/jti1a1/nl/controller/Main.java
Merge branch 'spel1' of https://github.com/loljimmo12/Stijgmachine into final

Conflicts:
	src/stijgmachine/jti1a1/nl/controller/Main.java
	src/stijgmachine/jti1a1/nl/objects/GameCursor.java
	src/stijgmachine/jti1a1/nl/view/MiniGameView.java