shrink the image
Merge branch 'master' into gh-pages
shrink the image
Merge branch 'master' into gh-pages

Conflicts:
	js/transformations.js