Update to push to master

Added Trap base class, added a image location to character/Hero