trying all
removed .rvmrc
fucked this up
Merge remote-tracking bransch 'origin/master'

Conflicts:
	.gitignore
	lib/qless/worker.rb