try
try
Merge branch 'masterMerge'

Conflicts:
	AISoccer/TrainingShootLogs.txt