Add pick in cocktail
Fix some errors
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
Modified some things for cocktail party
Minor updates
Merge branch 'master' of https://github.com/reem-utils/robocup2014 into cris_branch
added time in every test
Merge branch 'cris_branch' of https://github.com/reem-utils/robocup2014 into cris_branch
Merge branch 'cris_branch' of https://github.com/reem-utils/robocup2014 into cris_branch
Update of basic functionalities
Added node that looks at the id given by the topic follow_me/id
Merge branch 'master' of https://github.com/reem-utils/robocup2014
fixing conflict
Merge branch 'cris_branch'