Rebase
Merge branch 'newMaster'

Conflicts:
	AISoccer/TrainingLogs.txt