CheckOut
Merge branch 'master' into masterCheckOut

Conflicts:
	AISoccer/trainingLogs.txt
Merge branch 'masterCheckOut'

Conflicts:
	AISoccer/trainingLogs.txt