Did all student classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Student.java
	src/UnderGradTA.java