sign in and signup fixing models and controllers
solve conflict in routes
resolve conflict in routes
routes
fix root to
Update users.rb
Update user_log_controller.rb
Merge pull request #228 from BeshoSmile/T3.5_T3.6_JohnWagieh_52_151_singup_in

sign in and signup fixing models and controllers