Add README.md
Edit README.md
Merge branch 'feature/20140308-readme' into develop