Hw2 branch

Update master for HW2