Updated DemoController logic, map, and scan analysis fixes
Merge branch 'Navagation' of https://github.com/njfaries/ecse211grp6.git into Navagation
Merge branch 'Navagation' of https://github.com/njfaries/ecse211grp6.git into Navagation