user login and sign up
merge conflicts
Merge pull request #1 from ctorstens/user_controller

Merging of user_controller branch via pull request