merging
Merge branch 'master' of https://github.com/nolimet/GameJam2014

Conflicts:
	Assets/Scripts/Spawning/Spawner.cs
	Assets/Scripts/soundCheck.cs
	Assets/Textures/Materials/achtergrond_stage_1.mat.meta
	Assets/Textures/Materials/achtergrond_stage_2.mat.meta
	Assets/Textures/Materials/achtergrond_stage_3.mat.meta
	Assets/Textures/Materials/muzieknoot.mat.meta
	Assets/_Scene/GameJustin.unity
	Assets/particle effects/GameObject 1.controller
	Assets/particle effects/GameObject 2.controller
	Assets/particle effects/GameObject 3.controller
	Assets/particle effects/GameObject 4.controller
	Assets/particle effects/GameObject 5.controller
	Assets/particle effects/GameObject 6.controller
	Assets/particle effects/GameObject 7.controller
	Assets/particle effects/GameObject.controller
	Assets/particle effects/Main Camera.controller
	Assets/particle effects/Materials.meta
	Assets/particle effects/bluering.anim
	Assets/particle effects/bluewave.anim
	Assets/particle effects/greenring.anim
	Assets/particle effects/greenwave.anim
	Assets/particle effects/logo.png.meta
	Assets/particle effects/redring.anim
	Assets/particle effects/redwave.anim
	Assets/particle effects/yellow_wave.controller
	Assets/particle effects/yellowring.anim
	Assets/particle effects/yellowwave.anim