Made changes to the test-file
Made everything better because I never write bugs right?
Fixed nasty bug number 1! yay!
Merge branch 'master' into firstFeature

Conflicts:
	test-file.txt
Merge pull request #1 from Sparx-Robotics-1126/firstFeature

First feature