ass
Merge branch 'master' of https://github.com/li1378/cs190lab5_li1378
fixes merge conflicts on LabTemplate