Update README.md
Update README.md
Merge branch 'master' of https://github.com/ecrivain/my_app

Conflicts:
	README.md