small one before merging
Merge branch 'master' of github.com:iStefo/emberfest-impress

Conflicts:
	app/templates/editor.hbs
intermediary
Merge branch 'master' of github.com:iStefo/emberfest-impress

Conflicts:
	app/components/pin-pin.js