新建class

main class
Merge branch 'master' of https://github.com/tp6m4xup6/group_3

Conflicts:
	README.txt