added name
added name
Commit message
Fixed merge conflicts
Merge pull request #1 from UBC-VCL/vj-practice

Vj practice