Changes to the Robot to make it move
Merging with github and resolving conflicts