starting additions for the comment form / path
Merge and comments area

Conflicts:
	app/views/users/show.html.erb