- Change: Shrines now has a 30% chance of spawning at end of island
- Change: Some power ups have updated visuals
- Change: You now join the game with A (controller) or E (keyboard), instead of using the Spirit Power button
- Change: Camera fades to black and goes to menu, when you die
- Fix: The player colour rings are now always on the islands
Merge branch 'master' of https://github.com/julianstengaard/TwinSpirits
- Add: New spawn sounds
Merge branch 'master' of https://github.com/julianstengaard/TwinSpirits

Conflicts:
	Assets/Assets/doodads/shrine1/Materials.meta
	Assets/Assets/doodads/shrine1/Materials/doodad_shrine1_psd_diffuse.mat.meta
	Assets/Assets/doodads/shrine1/doodad_shrine1_diffuse.png
	Assets/Assets/doodads/shrine1/doodad_shrine1_mat.mat
	Assets/Assets/doodads/shrine1/doodad_shrine1_mesh.fbx
	Assets/Assets/doodads/shrine1/doodad_shrine1_mesh.fbx.meta
	Assets/Prefabs/Collectable/Items/DivineFavor.prefab
	Assets/Prefabs/Collectable/Items/Glass Cannon.prefab
	Assets/Prefabs/Collectable/Items/Icy Sword.prefab
	Assets/Scene/Particle and effects test scene.unity
- Merge
Merge branch 'master' of https://github.com/julianstengaard/TwinSpirits