work ahead
Merge branch 'master' of https://github.com/quinnmichaels/mobi

Conflicts:
	_css/global.css
	_hbs/card.hbs
	_js/global.js
	_js/global.min.js