new commit
Merge branch 'master' of https://github.com/gooswa/createkit

Conflicts:
	src/app/application.js