added all imgs and canvas edits
Resolved merge conflicts
Merge pull request #74 from jjacobskind/canvasFix

added all imgs and canvas edits