changed classes on images to ids; gave image attribute to major pieces
resolved merge conflicts
resolved merge conflicts and debugged