Merge
Merge branch 'master' of https://github.com/paramire/BdA-2014-Tarea1

Conflicts:
	css/style.css
	funciones.js
	index.html