Create README.md
test commit
Merge remote-tracking branch 'openshift/master' into test_branch

Merging master to git.
Merge commit 'ebfce1670fbe1d84fee30c83c44d8e1c56536f76'

Conflicts:
	app.rb