Added classes in filterSpam.cpp
Merge branch 'master' of https://github.com/ericwalker/dataminingHw1

Conflict local repository and github repository.