merged Duncan and Lizzy's code
Merge branch 'master' of https://github.com/emocallaghan/FinalProjectRobotLearning