General Commit
Merge branch 'Navagation' of https://github.com/njfaries/ecse211grp6 into Navagation