Merge pull request #1 from newScanTron/master

I don't know what I should put here