added machine class
Merge pull request #36 from yetanotherhacker/machine

added machine class