img on webapp
Merge branch 'master' of https://github.com/g3org3/g3org3.github.io

Conflicts:
	js/ug.js