hashed and salted password
merges jwt
works
merge conflicts merged
refactors
refactored, welcome still broken
Merge pull request #42 from Zhang/develop

Develop