added lab2 files
Merge branch 'master' of https://github.com/michaelghay/cosc460
ScanTest.testCache doesn't pass. Lab1Main works