Edit the readme file.
Merge branch 'master' of github.com:msrose/rails_template

Conflicts:
	README.md