New enemy, stuff
Merged my code