Merge branch 'master' of github.com:WeiMing2014/test

Conflicts:
	README
Merge branch 'master' of github.com:WeiMing2014/test