message ¼ö�
Merge branch 'master' of https://github.com/git2rails/rails

Conflicts:
	config/routes.rb
	test/controllers/api/posts_controller_test.rb
commit