Comments and style
Correcting previous merge
Commiting images that were not there
Trying to merge