discard these changes
Merge branch 'master' of github.com:solutionroute/margie

Conflicts:
	sass/base/_base.scss
	stylesheets/margie.css
fix vert rhythm