merging
Merge branch 'master' of github.com:franvergara66/Simbiosis_UCV

Conflicts:
	views/template.php