Must commit before I pull
I think I forgot to commit stuff in the group class and it lead to problems-- got that all worked out now
Conflicts:
	src/edu/umw/cpsc/collegesim/Decay.java
	src/edu/umw/cpsc/collegesim/Group.java