more merge conflix, also skeleton for dropdown
dropdown menu a bit more done
got initial nav link to be prettier
Merge pull request #28 from celeen/layout/css

Layout/css