Test
Merge branch 'master' of https://github.com/jarnailboparai/john

Conflicts:
	tmp/tmp1.txt
add .out in .gitignore