test commit
Merge branch 'testBranch' into develop

Conflicts:
	src/com/student/Student.java