Hw5

Pull hw5 code into master