Added nav menu
Fixed map
Merge branch 'master' of https://github.com/tonjeb/Assignment2