pulltest2 change class
Merge branch 'master' of https://github.com/kwangeom/newtest1

Conflicts:
	class.txt