images rendering
Merge branch 'master' of github.com:prestonp/copycat-worker

Conflicts:
	package.json