Clean up enemy.cs
merge conflict... again
Merge branch 'master' into Enrique