updated json
meh
combined
jie's marionette
removed pyc
hit it
Merge branch 'master' of github.com:aiisahik/hueNEW
stuff
Merge branch 'master' of github.com:aiisahik/hueNEW
final