home
Merge branch 'master' of https://github.com/montenegroariel/institucion

Conflicts:
	templates/home.html