class6
Merge https://github.com/kwangeom/newtest1

Conflicts:
	class.txt