final
Merge remote-tracking branch 'origin/correction'

Conflicts:
	bower.json
	gulpfile.js
	src/index.html
	src/modules/app.js