Fusade mina filer med det nya
Glömde uppdatera Game också
Merge branch 'master' of https://github.com/rasmusolofzon/Piaette.git

Conflicts:
	piaette/src/main/Game.java
Merge branch 'master' of https://github.com/rasmusolofzon/Piaette.git