little changes in animation & keyPressEvent & Enemy
for merge
merge