+
Merge remote-tracking branch 'origin/sinatra' into sinatra

Conflicts:
	barget.rb
~