Merge pull request #2 from RoboGroup3/master

Getting up to date
 I have change something
Merge branch 'master' of https://github.com/Stinktier/object_recognition
Merge pull request #5 from Stinktier/master

Some last changes