Homework 2
Merge pull request #3 from devonbeckett/master

Devon's HW2