update
Merge branch 'master' of https://github.com/fiahfy/js-oop
update