git commit --allow-empty -m ...
git commit -m ...
Merge branch 'master' of github.com:ahgood/nfp

Conflicts:
	.gitignore