update to lab 5.x.x and code 1.x.x
Merge pull request #10 from cjihrig/lab5

Update to lab 5.x.x and code 1.x.x