updated all the files'
Updated a bit of everything
Merge branch 'master' into gh-pages

Updating the gh-pages with the master branch so it doesn't freak later when I try to add more images...
added a lot more
added a new page