local changes
local branch issues
Merge pull request #7 from mreid1130/enemy_collision_detection

reviewed