home login
Merge branch 'master' of https://github.com/genval/aci570-cat2

Conflicts:
	app/Controller/CategoriesController.php
	app/Controller/HomeController.php