updated lab 1, added lab 2