Added some logs to this file
Merge into master
fixed a merge conflict
 removed a bunch of images
added back some of the images
Just added some comments