Merge branch 'master' of github.com:NickQiZhu/di.js

Conflicts:
	README.md