Merge pull request #10 from draycox/master

getting everything up to date
Merge pull request #11 from draycox/joey6

Merge pull request #10 from draycox/master