1
Merge branch 'master' of https://github.com/minstart01/test.git

Conflicts:
	MoaMoa/WebContent/test.txt