...
...
Merge branch 'master' of https://github.com/gonzalovinas/asdra-papa-escucha

Conflicts:
	app/views/layouts/application.html.erb