modified nav
Merge branch 'master' of https://github.com/Theoroque/itp460_project