Finished HW2
Merge pull request #68 from SparksterGuy/master

Finished HW2