Merge pull request #17 from rarice4/master

it works better than it did
small changes
fixed merge conflicts
added a global user var
Merge pull request #18 from crotten/master

added a global var for users
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team4