initial commit
Merge branch 'master' of https://github.com/securingsincity/john-android

Conflicts:
	.gitignore