temp
resloved conflicts

Conflicts:
	app/config/app.php
	app/routes.php