Map basically there
Merge branch 'master' of github.com:acheson/cs171pj2
Cleaning up dead code