admin h
class
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Class.java