Fixed error
Merge branch 'aelshen_branch'

Conflicts:
	src/SpamFilter.py
resolved conflict in SpamFilter.py
no changes?
no changes
Merge branch 'master' of https://github.com/aelshen/575-Project
Revert "no changes?"

This reverts commit 5870be9b2e17e1966733193d49d3cb82069efbc2.
reverting changes
Merge branch 'aelshen_branch'

Conflicts:
	Data/spam_list.txt
fixed conflict in SpamFile.txt
Added code for building cumulative demographic dictionaries
Merge branch 'master' into aelshen_branch