commit
Merge remote-tracking branch 'Cody/master'
Merge remote-tracking branch 'maloney626/master' into working
updated the flinch aspect of the move database class