Merge pull request #3 from BYU-MarsRover/development

Development
Merge pull request #4 from BYU-MarsRover/master

Merge pull request #3 from BYU-MarsRover/development