removed some redundancies, changed nav hover color
merged
Merge pull request #30 from lapty/master

merged