Map class altered
displayMap added
Merge origin/master