My local
Adding comments to a post
Merge branch 'master' of https://github.com/ingdiegosanchez/blog

Conflicts:
	app/controllers/home_controller.rb
	app/controllers/posts_controller.rb
	app/models/post.rb
	app/views/posts/_form.html.erb
	app/views/posts/index.html.erb
	app/views/posts/show.html.erb
	config/initializers/secret_token.rb
	config/routes.rb
	db/schema.rb