1. Resolve merge conflic in the homepage.html.erb. 2. Finished implemeting UpdateUserProfile for user_page.  3. Need to implement update_user_password