Initial, non-functional nav-bar
minor tweaks
Merge branch 'navbar'
Merging in non-functional navbar
Merge pull request #23 from zestos/master

Non functional navbar