new line
Merge branch 'master' of https://github.com/theSalt/CodeFAQ

Conflicts:
	FAQ_0_1.md