did major work on hw4 today with Xiaohu

this is the culmination of that work
Merge branch 'master' of github.com:ebanner/RPI_data_structures

Conflicts:
	homework/hw4/School.h
	homework/hw4/Student.cpp
	homework/hw4/Student.h