Updated data and CSVs
Merge branch 'aelshen_branch'

Conflicts:
	Data/spam_list.txt