Conflicts:
	app/models/post.rb
	app/models/user.rb
	config/initializers/socket.rb