Merge branch 'master' of https://github.com/oxytotem/xk3y-Scanner

Conflicts:
	.gitignore
Update