Conflicts :(
Merge branch 'master' of https://github.com/Felza/CDIO2.git
Merge branch 'master' of https://github.com/Felza/CDIO2.git

Conflicts:
	BestCDIO2/src/GUI/GUI.java
Merge branch 'master' of https://github.com/Felza/CDIO2.git

Conflicts:
	BestCDIO2/src/Game/Game.java
	BestCDIO2/src/Game/Player.java