Merge pull request #2 from erichs/master

Collision detection
Create display output of rover position
Merge branch 'master' of https://github.com/erichs/mars-rover
Merge pull request #3 from DavidIvy003/master

Create rover output, all tests passing