Merge pull request #1 from agreif/master

fixed faq file extension; added .markdown
format fix
another formatting fix