Merge branch 'master' into Foot
Merge branch 'master' into Foot
Merge branch 'Crown'
Shadowing "take action" heading
Merge branch 'Foot'
Merge branch 'master' into Foot
Merge branch 'master' of https://github.com/thechristopherbruce/Music4Canada

Conflicts:

wp-content/themes/music4canada/assets/stylesheets/modules/_take-action.s
css
	wp-content/themes/music4canada/style.css
Merge branch 'master' into Foot
a bunch of stuff
Merge branch 'master' into Crown
Twerks
Merge branch 'Foot'
end of night
Merge branch 'master' into Crown
Knitpicking details
fb stuff, meta tags etc
Merge branch 'master' of https://github.com/thechristopherbruce/Music4Canada

Conflicts:
	wp-content/themes/music4canada/.DS_Store
Merge branch 'master' into Crown
little padding fix