Merge branch 'master' of https://github.com/KSMSbotball/2014

Conflicts:
	test/test123.txt