Example Commit

Signed-off-by: Stephen Carlson <stephen_carlson@byu.edu>
Merge branch 'HEAD' of https://github.com/BYU-MarsRover/Basestation.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/BYU-MarsRover/Basestation