added chat page
Fix conflicts
Remove Gemfile.lock