route test first commit
aa
Merge branch 'route_test'

Conflicts:
	app/views/layouts/main.blade.php