library translation images
Merge branch 'master' of github.com:eschneider1992/depth-map
resolving merge conflicts