commit
Merge github.com:shangming/test

Conflicts:
	readme