？
Merge branch 'master' of github.com:atachimiko/kakitsubata

Conflicts:
	lib/api.rb
	lib/api/entities.rb
	lib/api/helpers.rb
	lib/api/session.rb
	spec/requests/api/session_spec.rb