EnemyFactory
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/el/game/ui/GameActivity.java
EnemyFactory