cleaned up scrubwords
Merge branch 'master' of https://github.com/jmc27/NISProject.git
Merge branch 'master' of https://github.com/jmc27/NISProject.git
Merge branch 'master' of https://github.com/jmc27/NISProject.git

Conflicts:
	ScrubWords.java