add human class
add foodbarge
resolved merge conflicts