fix
Merge branch 'master' of https://github.com/CIS399-S13/CIS399

Conflicts:
	Spam Email Blocking and Filtering final report.txt
add some