Merge branch 'erich-obstacle' of github.com:OregonStateMarsRover/Rover2014
Merge branch 'erich-obstacle' of github.com:OregonStateMarsRover/Rover2014
Merge branch 'erich-obstacle' of github.com:OregonStateMarsRover/Rover2014
Merge branch 'erich-obstacle' of github.com:OregonStateMarsRover/Rover2014
Pulled for newest code
Merge branch 'master' of github.com:OregonStateMarsRover/Rover2014