Merge pull request #20 from thanpolas/gitattributes-for-line-endings

Added .gitattributes to smooth new-line crlf issues
resolved conflicts and updated docs