Commit exe
Merging
Initial critter wave class
Fixing merge
Updated GameObject with collision detection methods
Moving critter wave
Merge branch 'master' of https://github.com/sli-fox/jamms into steph_branch
Merge pull request #36 from sli-fox/steph_branch

Steph branch
Merge pull request #33 from sli-fox/ajay_branch2

Updated GameObject with collision detection methods
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch
Critter animations removed from wave when at end tile
Implemented wave switching
Merge pull request #37 from sli-fox/steph_branch

Steph branch
Fixed bug in black cat
Merge pull request #38 from sli-fox/steph_branch

Fixed bug in black cat
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch