added char animations
BadGame

Conflicts:
	Assets/Scripts/Spawning/Spawner.cs
	Assets/blue_ring.prefab
	Assets/blue_ring.prefab.meta
	Assets/blue_wave.prefab
	Assets/blue_wave.prefab.meta
	Assets/green_ring.prefab
	Assets/green_ring.prefab.meta
	Assets/green_wave.prefab
	Assets/green_wave.prefab.meta
	Assets/red_ring.prefab
	Assets/red_ring.prefab.meta
	Assets/red_wave.prefab
	Assets/red_wave.prefab.meta
	Assets/yellow_ring.prefab
	Assets/yellow_ring.prefab.meta
	Assets/yellow_wave.prefab
	Assets/yellow_wave.prefab.meta