readme
Merge branch 'master' of https://github.com/julianxiao/javascript

Conflicts:
	didcl/readme.md