Aldrig fucka upp
Merge branch 'master' of http://github.com/HampusDahlin/beat-to-the-beat

Conflicts:
	BeatToTheBeat/src/gui/GamePanel.java
Merge branch 'master' of http://github.com/HampusDahlin/beat-to-the-beat