modified some of the names for links in the navbar.
Fixed merge issue
Fixed all links in nvabar
Fixed merge conflict
Merge pull request #11 from andreykul/master

Fixed contact us link in navbar