Fixed problems with homework 2
Fixed problems with homework 1