index
Merge branch 'master' of https://github.com/franciscoas/PHPminiframework

Conflicts:
	controller/HomeController.php