friends
Merge branch 'master' of https://github.com/Baltha/E09-PHP

Conflicts:
	app/Controllers/App_controller.php
	config/routes.ini