Temp change data.json
Merge branch 'master' of https://github.com/kaseyle/daydream
Add Weston's code