user sign in and up formating
Merge branch 'user'