Merge branch 'master' of https://github.com/SunnySup/BackboneCurso

Conflicts:
	js/main.js