added map parsing
resolved conflicts in robotBrain