ex12-2
Merge pull request #1 from trevorstedman/master

ex12-2