Blade and Locale playing
Merge branch 'master' of https://github.com/qschmick/laravelTesting

Conflicts:
	app/views/layout/master.blade.php
	app/views/testing.blade.php