Merge branch 'master' into Crown
Merge branch 'master' into Crown
Merge branch 'master' into Crown
button styles
Merge remote-tracking branch 'origin/Crown'

Conflicts:

wp-content/themes/music4canada/assets/stylesheets/patterns/_typography.s
css
	wp-content/themes/music4canada/style.css