Fixing merge.
Merge branch 'master' of github.com:mbrown7/IndependentStudy

Conflicts:
	src/edu/umw/cpsc/collegesim/Person.java
Fixed my own borked merge.
Merge branch 'master' of github.com:mbrown7/IndependentStudy
Changed implementation of "last tickled" to keep track of absolute time of
last tickle, rather than time elapsed since last tickle.