Merge pull request #2 from jhuffman1123/master

Merging after Tuesday Night.
Committing so I can pull...
Committing the resolved conflicts
Added the rest of the images, and a few other small changes.
Merge pull request #2 from jrtew/master

Pull For Ross's Updated Images