Ignore commit. My mistake.
Merge branch 'master' of https://github.com/Spartan0513/Norco-LCAD-Game

Conflicts:
	Assets/Troll_idle01.prefab