Users controller v1.0 up and running
Merged with master branch after pulling