changed nav bar
prof changes
merged
Merge branch 'master' of https://github.com/molllified/11thHour

merging with amia
merged