Merge remote-tracking branch 'Cody/branch2'
Added Flinch
Merge remote-tracking branch 'maloney626/master' into working