embers added from master
changed git ignore
change gitignore
delete meta
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Sounds/SFX/Enemy Death.mp3.meta
	TrickyNinja/Assets/Sounds/SFX/Enemy Die 2.mp3.meta
	TrickyNinja/Assets/Sounds/SFX/Enemy Die.mp3.meta
	TrickyNinja/Assets/Sounds/SFX/Enemy Hit.mp3.meta
	TrickyNinja/Assets/Sounds/SFX/EnemyHit2.mp3.meta
	TrickyNinja/Assets/Sounds/SFX/GotHit.wav.meta
	TrickyNinja/Assets/Sounds/SFX/JumpSound.wav.meta
	TrickyNinja/Assets/Sounds/SFX/LandSound.wav.meta
	TrickyNinja/Assets/Sounds/SFX/RopeAttack.wav.meta
	TrickyNinja/Assets/Sounds/SFX/StarThrow.wav.meta
	TrickyNinja/Assets/Sounds/SFX/SwordSwish1.wav.meta
	TrickyNinja/Assets/Sounds/SFX/SwordSwish2.wav.meta
	TrickyNinja/ProjectSettings/TagManager.asset