cleaned up map analyzer
Merge branch 'lab5_dev' of https://github.com/npmanor/rbe3002 into lab5_dev