#5
Merge branch 'master' of https://github.com/Kcko/spam-protection

Conflicts:
	xxx.txt