Changed user controller to render errors in view on initial sign up
Add lamp validations to not duplicate lamps on same bridge
merged master fixed conflicts with lamps_controller
update controller to fix testing bug
Merge branch 'master' into lampvalidations
Merge pull request #23 from ChaeOkay/lampvalidations

Lampvalidations