CORS Headers
Merge branch 'jon1'
Cosmetic updates to Nunavut
resolve conflicted files
small change to menu