added Barcelona event
fixed conflict
Merge pull request #35 from nunoveloso/barcelona_nodebots

added Barcelona event