Adding documentation and adding a comma.
Merge branch 'master' of github.com:andrew13/Laravel-4-Bootstrap-Starter-Site

Conflicts:
	app/config/app.php