Merge branch 'master' into JD
Added transitions, and deletion of fought enemies
Merge branch 'JD'