Tweaked boomerangs to go through each other

If they are the same players boomerangs
Tweaked player so he doesnt fall through floor
Merged master into editor