Merge pull request #4 from phammin1/hw2

Hw2 update with new naming convention