update solrconfig file
Merge branch 'master' of https://github.com/xcv58/535_project_3
add *.swp to .gitignore