Merge branch 'master' into gh-pages

# Conflicts: # _posts/2017-01-31-completing-the-switch-to-es6-classes.md
2017-01-31 22:24:27 -08:00 · 2017-01-31 22:24:27 -08:00 · 2577e83360
commit 2577e83360
parent b8d3f5a170 1c12708890
304 changed files with 14338 additions and 399 deletions
--- a/_posts/2017-01-31-completing-the-switch-to-es6-classes.md
+++ b/_posts/2017-01-31-completing-the-switch-to-es6-classes.md
@ -64,7 +64,7 @@ extensive use of:
 - *[const](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/const)* and *[let](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let)*
 - [Computed Properties](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Object_initializer#Computed_property_names)

-Those changes will come, but on a more piece-meal basis, as code is visited.
+Those changes will come, but on a more piecemeal basis, as code is visited.

 *[@jeffpar](http://twitter.com/jeffpar)*  
 *Jan 31, 2017*