Merge pull request #3 from BYU-MarsRover/development

Development