reply form showing
Make comment sort order ascending; User post/comment destroy dependency
Merge branch 'master' into masa
pre migration adding children
nested comment working - need to fix deletion for nested - masa
Merge branch 'master' into implement-votes

Conflicts:
	app/views/posts/_post.html.erb
	config/routes.rb