i'm slowly getting there....almost...maybe... i don't know.
added a line
Merge pull request #10 from UBC-VCL/ls-lisasquashes

Ls lisasquashes
Conflict Fix #2
Added a new file
Conflict fix
mend