modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/controllers/categories_controller.rb
	modified:   app/models/category.rb
	modified:   app/views/categories/search.html.erb
	new file:   elasticsearch-0.90.0.deb
Merge branch 'master' of https://github.com/mafik94/test1_svitla
tire gem
Merge branch 'master' of https://github.com/mafik94/test1_svitla

Conflicts:
	Gemfile
	Gemfile.lock

	modified:   Gemfile
	modified:   Gemfile.lock
	modified:   app/models/category.rb
	deleted:    index/development/category/_g_0.del
	deleted:    index/development/category/segments_s