Merge branch 'master' of https://github.com/shagtv/laravel

Conflicts:
	public/css/style.css