Merge pull request #23 from sli-fox/steph_branch

Steph branch
map editor interface complete, game now owns static map
barebones interface complete
Some projectile/collision changes
fixed merge
Merge pull request #25 from sli-fox/jeremy

Jeremy
Changed animation handler and BlackCat
Merge pull request #26 from sli-fox/marky_branch

Changed animation handler and BlackCat
Fixed Waypoints
Merge branch 'master' of https://github.com/sli-fox/jamms into marky_branch
Merge pull request #27 from sli-fox/marky_branch

Marky branch
fixing crash on play button
Merge pull request #28 from sli-fox/jeremy

fixing crash on play button
Commit exe
Merging
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