Merge pull request #1 from newScanTron/master

added a user class
Merge pull request #4 from Cubis101/master

Merge pull request #1 from newScanTron/master
Merge pull request #1 from newScanTron/master

I don't know what I should put here