re-added sample nightwatch.json
Merge remote-tracking branch 'upstream/master'