htaccess
js
Merge branch 'master' of https://github.com/youenna/metalsevilla

Conflicts:
	.htaccess
Merge branch 'master' of https://github.com/youenna/metalsevilla
Merge branch 'master' of https://github.com/youenna/metalsevilla
Merge branch 'master' of https://github.com/youenna/metalsevilla
Merge branch 'master' of https://github.com/youenna/metalsevilla
ficheros de files de producción