docs
Merge branch 'master' of github.com:ivobenedito/jortec-workshop

Conflicts:
	backbone-demos/README.md