Added new textures and enemies
Fixed merge conflicts