She made me do it
Merge branch 'master' of https://github.com/acbui/spookystack

Conflicts:
	spookystack/Assets/Scenes/main.unity
	spookystack/Assets/Sprites/TitleScreen.png.meta
	spookystack/Assets/Sprites/player_1_win.png.meta
	spookystack/Assets/Sprites/player_2_win.png.meta
	spookystack/Assets/Sprites/start_button.png.meta
xdfxdf
dfgf
fsdfs
ty