Merge pull request #6 from RoboGroup3/master

Updates
Fixes error in checkingObjectInMap
Removes some ROS_INFO
Fixes merge conflict
Merge branch 'JohanJohansson-master'