Working on keshif integration
Merge branch 'master' of github.com:pjfan/ClinicalTrialsParser

Conflicts:
	generated_keshif_json.json
Adding file
Merge branch 'master' of github.com:pjfan/ClinicalTrialsParser

Conflicts:
	parse/xml/NCT00504075.xml
Fixing geotagging bug