routes
Merge branch 'master' of github.com:juaguz/softlaw
Merge branch 'master' of github.com:juaguz/softlaw

Conflicts:
	app/routes.php