Temporary commit, stealing Corrado's pc
Merge branch 'master' of https://github.com/valeriovarricchio/DRC_catkin
Solving a small conflict