updated fr use
fix gitignore

Conflicts:
	.gitignore
Merge https://github.com/Jimtrim/dontpanic_docs