Added subject and conversation to pm
run ./generate.sh
Merge branch 'clean2'

Conflicts:
	app/models/pm.rb
	app/views/pms/index.html.erb
	app/views/pms/show.html.erb
Merge branch 'master' of https://github.com/LukeShu/leaguer