Merge branch 'master' of https://github.com/collectifco/rhymeandrhythm

Conflicts:
	SASS/default.scss
	default.css
	pricing/default.html