added in another cannon and more images
Merge branch 'master' into gh-pages