kaihatu2
Merge branch 'develop' of https://github.com/matchingood/test into develop

Conflicts:
	test.txt