seguimos en la lucha jeje
Merge branch 'master' of https://github.com/PyCamp/Rockola

Conflicts:
	templates/index.html