Added User login to view
Resolved conflict in gemfile.lock
Added image model