Create README.md
Edit README
Merge branch 'master' into integrating_solr

Conflicts:
	README.md