Merge pull request #16 from aproctor/master

sync
stuffffff
fishy anims
Merge branch 'master' of github.com:aproctor/thrillho into aproctor-master

Conflicts:
	Assets/Resources/Prefabs/Levels/Level_1.prefab
petard level.
endlevelstuff
Merge pull request #37 from tylerhebenton/master

Level 1 + 2