fixed collision
cleanup collision fix, remove recently dead list to (hopefully) fix the flicker/overwrite problem
Merge pull request #6 from jordenh/fix-collision

Fix collision
merging with master