:
:wq

Added url listing, need messages/show file
cleanup before merge
Merge branch 'add_url'
:wq
::::::::
Conflicts:
	app/views/messages/new.erb
	app/views/messages/show.erb