Recursive comments work
Broke recursive comments again
Got comments working again
Merge branch 'master' of github.com:lisavogtsf/awesome_blog

Conflicts:
	app/views/shared/_comment_form.html.erb
Merge pull request #117 from MooreJesseB/master

Comments work.  Adding comments on comments doesn't.