Added User model
Make a basic User model(including secure password)
Make a basic User model(including secure password)
Fix merged conflict