Eating works!

Can eat food from that is in inventory or current location.

Overloaded remove method in inventory to accept id for an object.
Resolved conflicts.

Merge branch 'dv1457_2_local' of github.com:CaterHatterPillar/dv1457 into dv1457_2_local

Conflicts:
	2/src/AgentInteract.cpp
	2/src/AgentInteract.h