pulled the sinatra app
pulled the sinatra app
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/gremlin/server.rb