Some projectile/collision changes
Merge pull request #28 from sli-fox/jeremy

fixing crash on play button
Pulled working base code and merged conflict with Jeremy on GameObject.cpp
Player class initial commit
Player class initial commit
Merge branch 'ajay_branch2' of https://github.com/sli-fox/jamms into ajay_branch2
Merge pull request #29 from sli-fox/ajay_branch2

Ajay branch2 Player class
Displaying Towers and Critters Specs
commiting specs
Revert "Ajay branch2"
Merge pull request #30 from sli-fox/revert-29-ajay_branch2

Revert "Ajay branch2"
Reverting merge
Fixing merge again
Fully integrated Player class. canAttack() uses timer.
Fully integrated Player class. canAttack() uses timer.
Merge pull request #31 from sli-fox/marky_branch

Marky branch