added hwk2 and lab3