halfway through chorus
dancing some
Merge branch 'version3'

Conflicts:
	todo.txt