probando si termino el relajo
Merge branch 'master' of https://github.com/Turupawn/HackathonMunonSite

Conflicts:
	log/development.log