Modificando la vista de home
Merge branch 'master' of https://github.com/monolinux/demoFlask

Conflicts:
	templates/home.html