merge
Merge branch 'master' of https://github.com/alicia16489/gameJS
update features WTF