Commit For touches
Merge branch 'master' into branch_ryan
TImer
Fixed bat ascension
Fixed conflicts on merge