npm installing things
Merge remote-tracking branch 'origin/master'

Just merging things.