Note
Merge branch 'master' of https://github.com/dontplay/laravel-coverdale.me

Conflicts:
	app/routes.php