Merge pull request #11 from UBC-VCL/ls-lisasquashes

Ls lisasquashes
deleted lines

deleted lines and changed to winky face