collectifco/rhymeandrhythm — pull request #6 by josiahwiebe (2014-01-19 20:13:46+00:00)
Title: Merge branch 'master' of https://github.com/collectifco/rhymeandrhythm

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