lamp show page has orbit styling
removed orbit from lamp show
fixed indentation
small indentation change
added containing class to lamps
Merge branch 'master' into lamp_display
removed extra class style
resolved merge conflict
Added return to user show on lamp show page
link to return to lamps page styled
Merge pull request #49 from ChaeOkay/testing

Testing
change assets dir img
remov img public
Merge pull request #50 from ChaeOkay/1218

1218
removed extra lampt title and styled
Merge pull request #51 from ChaeOkay/lamp_display

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

Imagepub