mod the readme file!
Merge branch 'master' of https://github.com/WindsorWang/code2013

Conflicts:
	readme
merge