Creating template
getting Open Shift set up correctly to host my app
Merge branch 'master' of ssh://todo-farrierapp1.rhcloud.com/~/git/todo

Conflicts:
	config.ru