se agrego la pagina de inicio
Merge branch 'master' of https://github.com/oscarb92/freymca

Conflicts:
	cakephp/app/Controller/UsersController.php
	cakephp/app/View/Layouts/default.ctp