added solr files
added git ignore
added solr files, again
merge