Tidied up code
x
Combo system implemented
update
Fireballs oot yer arse
Ai state machine
Tidied up merge and added basic shovel animation
Modularising Respawning
Detaching UnityEditor req
updated gitnore to ignore Build folder
adding new sprite sheets
bit of a clusterfuck - may have to revert
:+1:
:+1: :+1:
x
Merge remote-tracking branch 'origin/develop-kyle' into develop-kyle

Conflicts:
	Assets/Prefabs/FLKYq3A.prefab
	Assets/Prefabs/Wall.prefab
	Assets/Scenes/NewEnviro.unity
Things broke a bit
Merge remote-tracking branch 'origin/develop-ian' into staging
Healthbars and random tile sprite and other assorted goodies
Merge branch 'staging' of https://github.com/Atuuh/Super-Shovel-Saga into staging

Conflicts:
	Assets/CaveGenerator.cs