Merge pull request #6 from Beck0159/master

Up to date
Merge pull request #7 from west0135/master

Hmm?
deleted a bunch of stuff
Merge pull request #8 from west0135/dan

Dan