1
Merge branch 'master' of https://github.com/abaddonGIT/goodImage

Conflicts:
	index.html
	js/goodImage.js
1
Merge branch 'master' of https://github.com/abaddonGIT/goodImage

Conflicts:
	index.html.orig
	js/goodImage.js
	js/goodImage.js.orig
1