Working navbar
Merge branch 'navbar2'
Merging in working navbar
Merge pull request #25 from zestos/master

Working navbar