schedule is done
Merge branch 'master' of https://github.com/KernelCorp/almadeladanza

Conflicts:
	app/assets/stylesheets/lib/dance_styles.css.sass