map resizing is now a thing.
Resolved merge errors
Merge branch 'master' of github.com:cwgeary/rbe3002-d14-teamZTC