allowed assignment map remove calls to return the object they removed
Merge branch 'master' of https://github.com/albchu/CPSC-433-Project