a
Merge branch 'masterMerge'
debuggage shootTraining