Fixed several typos, replace the nothing_happens picture
Merge branch 'master' into gh-pages