add gif and jpeg
Merge branch 'master' into gh-pages

* master:
  add some screenshots

Conflicts:
	README.md
typo