stuff. suff
Merge branch 'master' of https://github.com/philt5252/FacePlant

Conflicts:
	GroundFighter/Assets/Animations/snicks sprite sheet_0.controller
	GroundFighter/Assets/Animations/snicksdeath.anim
	GroundFighter/Assets/Custom Scripts/Snickerdoodle.js
	GroundFighter/Assets/Environment Elements/Prefabs/snicks sprite sheet_0 1.prefab
	GroundFighter/Assets/Scenes/GameOver.unity
	GroundFighter/Assets/Scenes/Level1.unity
	GroundFighter/Assets/UI elements/MainMenu.guiskin