changed something
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cz/gug/hackathon/glass/gimmeatone/Tone.java