mina.hack ignored
Merge branch 'master' of https://github.com/yzt/class_test2

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/yzt/class_test2

Conflicts:
	.gitignore