clean
merge
Added damage/knockback to all player and enemy attacks