First commit
Merge branch 'master' of https://github.com/plec/captchaService

Conflicts:
	.gitignore