Some changes in the agenda
Merge branch 'master' of github.com:icoloma/web-codemotion

Conflicts:
	src/js/talks/data.js
	src/talks.json