stuff
Merge pull request #12 from aproctor/master

Sync
blah blah blah
Merge branch 'master' of https://github.com/aproctor/thrillho

Conflicts:
	Assets/Scripts/Core/CarvalloAnimator.cs
Merge pull request #30 from tylerhebenton/master

level 2
Merge pull request #29 from AndrewUken/master

Lee animations for IDLE and ATTACK 2
turtle update
Merge branch 'master' of https://github.com/aproctor/thrillho
LD stuff
Merge pull request #13 from aproctor/master

sdada
Merge pull request #32 from tylerhebenton/master

LD stuff
level 1 turltes
Merge branch 'master' of https://github.com/aproctor/thrillho

Conflicts:
	Assets/Resources/Prefabs/Levels/Level_1.prefab
Merge pull request #7 from aproctor/master

Merge Latest MAster