Just to get changes
Merge remote-tracking branch 'origin/master'
Think I fixed the attack bug for all other states of the game.