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

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

Conflicts:
	solr/pids/development/sunspot-solr-development.pid