lvl2 map stuff
Merge branch 'master' of https://github.com/fryingpan/Assignment2
lv2 graphics
Merge branch 'master' of https://github.com/fryingpan/Assignment2