merge
Merge branch 'master' of https://github.com/mikewgd/my-js

# By mikewgd
# Via mikewgd
* 'master' of https://github.com/mikewgd/my-js:
  updated