pulling down master
pulling canvas
troubleshooting img not found
added dev1
fixed merge conflict