add laozhikun
add lovely zhangning
Merge branch 'master' into sourcetree

Conflicts:
	README.md
choose zhangning rather than laozhikun