Editing Nav Styling
Fixed Merge Conflict
Editing Nav
Merge branch 'master' of https://github.com/Fit-Genie/fit-genie-site into CreateNav
Edited Nav Styles
Fixed Merge Conflict
Merge pull request #30 from Fit-Genie/CreateNav

Create nav