add laser on click
Fixed conflicts; pushed stuff