commit second time
Merge branch 'master' of https://github.com/schonChen/learn_20140303

Conflicts:
	README.md