edits
Merge branch 'master' of https://github.com/balancerockmedia/es6-demo