merge
Merge branch 'master' of https://github.com/superguigui/crma15-workshop-showcase

Conflicts:
	build/build.js
	build/styles.css