Music options
Merge branch 'master' of https://github.com/stianfauskanger/ggj14

Conflicts:
	src/com/galacticgoat/lightsquirter/Config.java
Add onOFF