change
Merge branch 'master' of https://github.com/cisbjmaclean/Student

Conflicts:
	Student/nbproject/private/private.properties
	Student/src/student/Student.java