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

Conflicts:
	index.html
	js/main.js
Merge branch 'master' of https://github.com/SunnySup/BackboneCurso