Merge pull request #42 from ChaeOkay/testing

TESTING
refactor logged in
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
click on image to trigger on-off form submitt, hide button
remove submit button class on on-off form
on image
fix merge conflict
Merge pull request #44 from ChaeOkay/colorChange

Color change
ruby version declared
Merge branch 'master' into clickme
Merge pull request #45 from ChaeOkay/clickme

Clickme
add brightness to color comands
image source location
Merge pull request #46 from ChaeOkay/clickon

image source location