Merge pull request #1 from newScanTron/master

I don't know what I should put here
Merge pull request #5 from Nohbody/master

Merge pull request #1 from newScanTron/master