Added Enemy implementation
Fixing conflicts