first commit and login
merged