primera version de algo..
Merge branch 'master' of https://github.com/MiliGaricoits/WIR

Conflicts:
	css/style.css
	views/home.html