add some from john-tag
Merge branch 'master' of https://github.com/jarnailboparai/john

Conflicts:
	amrit.txt