Completed EnemyFactory
Merged branch from Goctor's master to TheAlbertJen's master