merged most recent copy
Merge branch 'master' of https://github.com/red-spotted-newts-2014/haunted
randomization for ghost
delete lines for pull
Merge pull request #34 from dabeeya/master

add collision and kill
commit change before pull
Merge remote-tracking branch 'upstream/master'