Merge pull request #48 from JSchulhof/master

bug fix
navbar changes
Merge branch 'final_updates' of https://github.com/pazzissima/wdi-group-project into pazzissima-final_updates
removed turbolinks
Merge pull request #50 from JSchulhof/turbo

removed turbolinks