Merge branch 'master' of github.com:walkingfishstudios/vertebra

Conflicts:
	index.html
	js/collections/portfolioOverviewCards.js
	js/routers/router.js
Merge branch 'master' of github.com:walkingfishstudios/vertebra

Conflicts:
	js/routers/router.js