Added the Plant sprite - it kills Mario.
Resolved merge conflicts in LevelFactory and MarioLib.