img test
removed log files
'log'
Merge ssh://ruby-imaginary.rhcloud.com/~/git/ruby

Conflicts:
	log/development.log
	log/test.log
removed log
auth