Merge branch 'master' of https://github.com/devan5/dances

Conflicts:
	license.txt
Merge branch 'master' of https://github.com/devan5/dances