Merge pull request #5 from RoboGroup3/master

Last commits from Robogroup
Created costmap for path finding node
Fixed merge conflict
Merge branch 'valeRB-master'
Merge pull request #10 from JohanJohansson/master

Merge fixed