added css and navbar
fixed merge conflicts
Merge pull request #22 from zrivest/css

added css and navbar