added more test images
fixed merge conflict
Merge branch 'master' of https://github.com/simzou/robots