added robot logic
Merge branch 'nick'