gitignore
headers
Merge branch 'refs/heads/test'

Conflicts:
	app/controllers/posts_controller.rb