Test conflit 3
Merge branch 'master' of https://github.com/cyjia/springtest

Conflicts:
	README.md