created robot, included unit tests
fixed merge conflicts from initial pull