first checking
Merge branch 'master' of https://github.com/javabeanz/owasp-security-logging

Conflicts:
	.gitignore