smexier solution
Merge branch 'master' of http://github.com/HampusDahlin/Beat-to-the-beat

Conflicts:
	BeatToTheBeat/src/gui/GamePanel.java
	BeatToTheBeat/src/gui/Options.java