commit
Merge branch 'master' of https://github.com/git2rails/rails

Conflicts:
	app/controllers/api/posts_controller.rb
Merge branch 'master' of https://github.com/git2rails/rails

Conflicts:
	app/controllers/api/posts_controller.rb