work
Class two!
Merge pull request #32 from calvintennant/master

changes