Moving forward
Merging
Merge branch 'master' of https://github.com/CrabLabs/Bonfire

Conflicts:
	app/styles/_bonfire.scss