jason

Add the code for creating setting page
jason
test group commit same file
test
Test
test
test
Merge branch 'master' of https://github.com/GerGerson/laravel

Conflicts:
	app/routes.php