Added AttackObject, edited CharacterObject
Fixed conflicts in gameobject