Creating template
Merge branch 'master' of ssh://todo-tdgeebee.rhcloud.com/~/git/todo

Conflicts:
	config.ru
Mail setup in production
Production database fix
Modify README.md