jiaru age
Merge remote-tracking branch 'origin/master'

Conflicts:
	GitTraining/src/edu/fjnu/domain/Student.java