Merge pull request #16 from crotten/master

working on user controller
it works better than it did
Merge pull request #17 from rarice4/master

it works better than it did
small changes
fixed merge conflicts
added a global user var