Merge pull request #34 from blind-squirrel/alex

Alex
Added navbar to master.blade.php
Merge branch 'master' into alex