models.py: added .csv reader to read the terrorism records
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/models.py
models.py: added .csv reader to read the terrorism records