About
Nuevas imagenes y About
Los modifique
Modificacion
About.php
Merge branch 'origin/josue'

Conflicts:
	App/Views/about.html
	App/Views/headers/header.html
	resources/css/style.page.css