add signin and update migration for has_secure_password
remove sign_up.html.erb
fix merge conflict