did some css in nav and body
fixed merged conflicts
Merge pull request #17 from lrakhman/layout

did some css in nav and body