added poop, changed food drop function
fixed merge conflict
Merge pull request #55 from red-admirals-2014/poop

Poop