Committing so I can pull...
Committing the resolved conflicts
Added the rest of the images, and a few other small changes.