add user_id to trips if user logged in
fix user controller error
Merge pull request #48 from Edchen001/fix_log_in_form

Fix log in form