clean up a little
comment out function for collision handler
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
delete ds store
Merge pull request #66 from rootulp/master

merge everything