jpg/gif support roughed in
Merge branch 'refs/heads/master' into multi-threaded

Conflicts:
	imgavg.go