use thin
Merge branch 'master' of github.com:theodi/deployment-test-app

Conflicts:
	Gemfile