style of navbar and homepage
resolve merge conflict
Merge pull request #7 from maaviles/css-base

style of navbar and homepage