Oops...
Merge branch 'master' of https://github.com/HampusDahlin/Beat-to-the-Beat

Conflicts:
	BeatToTheBeat/src/controller/HeadControl.java