Playing with particles
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/Prefabs/Elf.prefab
	Assets/Resources/Prefabs/Kid.prefab
	Assets/Scripts/Player.cs
	Assets/Scripts/Weapon.cs
merge conflicts