exercise 1-12
Merge pull request #3 from trevorstedman/master

exercise 1-12