meta synch yo!
and again
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Assets/Resources/Animations/PlayerAnim.prefab.meta
	Assets/Resources/Audio/Raw/Rec_ahhhhhh.mp3.meta
	Assets/Resources/Audio/Raw/knife.mp3.meta
	Assets/Resources/Audio/Raw/rec_ahahahahah.mp3.meta
	Assets/Resources/Audio/Raw/rec_yayayayay_hi.mp3.meta
	Assets/Resources/Audio/Raw/rec_yayayayayayayayay.mp3.meta
	Assets/Resources/Audio/crowd_base_2.mp3.meta
	Assets/Resources/Prefabs/Elf.prefab.meta
	Assets/Resources/Textures/Elf.png.meta
	Assets/Resources/Textures/Player.png.meta
	Assets/Scripts/Enemy.cs.meta
	Assets/SpriteCollections/PlayerAnim Data.meta
	Assets/SpriteCollections/PlayerAnim Data/PlayerAnim.prefab.meta
	Assets/SpriteCollections/PlayerAnim Data/atlas0 material.mat.meta
	Assets/SpriteCollections/PlayerAnim Data/atlas0.png.meta
	Assets/SpriteCollections/PlayerAnim.prefab.meta