Prueba backbone con Modelo y vista
Merge branch 'master' of https://github.com/nachodegrau/witbeat

Conflicts:
	app/logs/dev.log