Tried to fix 2nd playthrough, not complete
Merge branch 'develop' of https://github.com/bro9918/24Game into develop