Create rails root for torquebox rails app.
Merge branch 'master' of https://github.com/jjfraz11/openshift-torquebox

Conflicts:
	Gemfile
	Gemfile.lock
	config.ru