Dance styles page is in progress.
Layout and dance styles page are in progress.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/admin/coach.rb
	db/schema.rb