good navbar done
Merge pull request #22 from notandrewkaye/master

final(ish) navbar