Update README.md
Merge branch 'master' of https://github.com/Dandandan/wikiprogramming into dev