class 2
Merge pull request #28 from omicron-theta/chris_sheehan_class_2

class 2