object recognition
Merge branch 'master' of github.com:oscar-lima/rock-in
pushing move it