jinl
Merge branch 'master' of https://github.com/kerrer/images-club

Conflicts:
	app/webroot/css/speed_imgs.css