Added lab2 files; deleted test class; changed comment scheme for version differences;