initial commit
	new file:   README.md
	deleted:    data/download_xml.sh
	new file:   old/download_data.py
adding the django setup
untrack files
add documentation setup
	new file:   run_es.sh
	new file:   index/params.py
	modified:   index.txt
	modified:   run_es.sh
	modified:   ../doc/source/conf.py
	deleted:    ../doc/source/index.txt
	deleted:    ../index/params.py
	new file:   params.py
	new file:   runIndexing.py
	modified:   ../run_es.sh
add documentation source
	new file:   ../doc/source/ToDo.rst
	new file:   ../doc/source/dependency.rst
	new file:   ../doc/source/setup_es.rst
	modified:   ../doc/source/setup_es.rst
	new file:   indexGCLD.py
	modified:   params.py
	modified:   runIndexing.py
	modified:   indexGCLD.py
	modified:   params.py
	modified:   preprocess/indexGCLD.py
	modified:   preprocess/runIndexing.py
Merge branch 'master' of https://bitbucket.org/jiyinhe/kb-st

Conflicts:
	st/preprocess/indexGCLD.py
	new file:   string_util.py
	new file:   etc/elasticsearch.yml
	renamed:    indexGCLD.py -> runIndexGCLD.py
	renamed:    runIndexing.py -> runIndexKBNews.py
	modified:   params.py
	modified:   runIndexKBNews.py
	modified:   ../run_es.sh