This is a commit test. Hello
Merge branch 'master' of https://github.com/HarkerRobo/RobotCode2015

Conflicts:
	whitespacetest.txt