update readme
Merge branch 'master' of https://github.com/Sophen/rails_basic

Conflicts:
	README.md