Small c
Merge branch 'master' of https://github.com/Istarnion/TeamBeard

Conflicts:
	DrawingRobot/MusicState.java