Tweak
Merge github.com:alexbartlow/1_john_inductive

Conflicts:
	.gitignore