Merge pull request #3 from polavar3/hw2

Pull request for hw3