Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/GameScene.unity
Merge branch 'master' of https://github.com/kjjeon5204/HorrorTheHunt