Stupid Agent , Basic agent conditionals
Merge remote-tracking branch 'origin/master'

Conflicts:
	FirstAgentShared/bin/unalcol/agents/examples/labyrinth/teseo/grupo7/FirstAgent.class