Merge pull request #61 from sli-fox/marky_branch

Reverted a fix, added critters_remaining attribute to CritterWave
Critter activation bug fix
Merge pull request #62 from sli-fox/steph_branch

Critter activation bug fix
Fixed timer
Fixed bugs
Fixed bugs