Changes v2

v2
Merge branch 'Jack-Branch' of https://github.com/Mistaman/RPGGame into Jack-Branch