move images to public
pub path
remove li
Merge pull request #52 from ChaeOkay/imagepub

Imagepub
img on to off
fix feature tests to pass
Merge branch 'master' into testing
Merge pull request #53 from ChaeOkay/testing

Testing
fix lamp feature test. TESTS ALL GREEN!
Merge branch 'master' into testing
Merge pull request #54 from ChaeOkay/testing

Testing
add new js libraries
update color js
add touch function to slider
remove button
remove button
add js shakejs and jqueryuiipad
Merge pull request #55 from ChaeOkay/lampsPage

Lamps page
refactor controller lamp and updated tests
Merge branch 'master' into testing