my first git commit!
Merge pull request #13 from selconway/SamConway_class_1

my first git commit!