starting to get year stuff in
Merge branch 'master' of https://github.com/mbrown7/IndependentStudy

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