merge stuff
added preference outputs divided between graduates and dropouts
Merge branch 'master' of https://github.com/mbrown7/IndependentStudy

Conflicts:
	src/edu/umw/cpsc/collegesim/Person.java