changed routes
Merge branch 'master' of https://github.com/EricRoos/PHPFramework

Conflicts:
	config/routes.php