Stylus minimus
Merge branch 'styling'

Conflicts:
	application/views/master.blade.php