small changes
fixed merge conflicts
added a global user var
Merge pull request #18 from crotten/master

added a global var for users