Change john.txt to force merge
Merge branch 'master' of https://github.com/jfking/gittest into jking

Conflicts:
	john.txt