#typo
Merge branch 'master' of github.com:joeybaker/wheelhouse-handlebars

Conflicts:
	package.json