Prepared code for regular expression filtering
Changed how words are represented
Merge branch 'master' of github.com:SalamiCo/ISBC-P1

Conflicts:
	core.php