Updated Sprite class -> AnimatedSprite Class, minor changes to weapon class
Added damage taking functionality fot enemy
Merge from master