fixed a bug

fixed a bug with attributes allocation
character Screen stuff

now with character updates
Merge branch 'JD'

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