completed test cases for robot. about to start test cases for main.
fixing merge again
fixing merge
Merge branch 'nick'
a