fix conflict
Merge branch 'int_ranges' of git@github.com:npolar/icelastic.git into
int_ranges

Conflicts:
	spec/icelastic/response_writer/feed_spec.rb