Merge branch 'master' of https://github.com/graybeal/cf-conventions

Conflicts:
	FAQ.md
Merge branch 'master' of https://github.com/graybeal/cf-conventions

Conflicts:
	FAQ.md