Fixed Map bugs
Merge branch 'master' of github.com:CompSciClub/Pathfinder