Merge pull request #9 from aproctor/master

Get Latest Master
Lee's got a new animation in his animator controller.
new level, no ranged attack
Merge pull request #36 from AndrewUken/master

Lee's Animator now correct selects attack_02.
Merge branch 'master' of https://github.com/aproctor/thrillho

Conflicts:
	Assets/Scenes/game.unity
Merge branch 'master' of https://github.com/aproctor/thrillho
merge resolution game scene
default club
Merge branch 'master' of github.com:aproctor/thrillho
credits to startup
level mapping
fishy anims
Merge branch 'master' of github.com:aproctor/thrillho into aproctor-master

Conflicts:
	Assets/Resources/Prefabs/Levels/Level_1.prefab