..
..Merge branch 'master' of github.com:yielding/code

Conflicts:
	app/ithmb/ithmb_convert.rb