changed dialogue a bit
Merge branch 'master' of https://github.com/jianshentan/cs032_game
Merge branch 'master' of https://github.com/jianshentan/cs032_game
Merge branch 'master' of https://github.com/jianshentan/cs032_game
stuff for vr room, starting bgm
merged