rolend
Merge branch 'master' of https://github.com/cocodas/javaBasic.git

Conflicts:
	src/standard_of_java/execise/ch6/ques5/Student.java