TESTING
Merge pull request #42 from ChaeOkay/testing

TESTING
add color picking functionality
add color and sat to api cont
update lamp form to hold hidden attributes
remove orbit from view
add data
add set_color_and_sat
Merge pull request #43 from ChaeOkay/clickme

Clickme
fix merge conflict
Merge pull request #44 from ChaeOkay/colorChange

Color change
ruby version declared
Merge branch 'master' into clickme