Optimized images
Merge branch 'gh-pages'

Conflicts:
	config.codekit