PRESENTATION
Merge branch 'alex'

Conflicts:
	app/views/layouts/master.blade.php