Merge branch 'clean2'

Conflicts:
	app/models/pm.rb
	app/views/pms/index.html.erb
	app/views/pms/show.html.erb

1 files changed, 1 insertions, 0 deletions

diff --git a/app/models/pm.rb b/app/models/pm.rb
index 3ebb69d..8b06181 100644
--- a/app/models/pm.rb
+++ b/app/models/pm.rb
@@ -1,6 +1,7 @@
 class Pm < ActiveRecord::Base
 	belongs_to :author, class_name: "User"
 	belongs_to :recipient, class_name: "User"
+	belongs_to :conversation
 
 	def name
 		return current_user.name