added cmpe140Lab2 stuff