crazy shit
Merge branch 'master' of https://github.com/XiDevelopment/BikeChallenge

Conflicts:
	TestRick.txt