[Avida-cvs] avida/current/source/main CVS commit

[Dr. Charles A. Ofria]

Update of /cvsroot/avida/avida/current/source/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30001/source/main

Modified Files:
	organism.cc phenotype.cc 
Log Message:
Setup merits so that they can go negative *during* an organisms
lifetime without Avida crashing, but will be raised to zero at the
divide or else whenever they are used in the scheduler.