Tweaked some button stuff
Resetting is better
Merge branch 'master' of https://github.com/QuinnPainter/AngrySanta

Conflicts:
	Assets/Game Scene.unity
Get rid of weird merge stuff