pohoje robit
Merge branch 'master' of https://github.com/Karmickoala904/RssRuby

* 'master' of https://github.com/Karmickoala904/RssRuby:
  ddsa
  del

Conflicts:
	app/models/rssbase.rb
	solr/data/development/index/segments.gen

asdf