fixed mergerr
Merge branch 'master' of github.com:Adalden/hue