Going to merge
Merge branch 'master' into variable_tempo

Conflicts:
	singdatshit.py