First README updates
Merge branch 'master' of https://github.com/depl0y/ror-template

Conflicts:
	README.md