Added spawnpoints
Fixing merge errors