user creation, log in/out
merge fixes
merge fixes
Merge pull request #2 from NatalieFrecka/user_functions

User functions