sj changes
Merge branch 'master' of https://github.com/Kyxsune/Liar_Game