Used these instructions to create a .gitattributes file to hopefully eliminate line ending conflicts: https://help.github.com/articles/dealing-with-line-endings/#re-normalizing-a-repository
Used these instructions to create a .gitattributes file to hopefully eliminate line ending conflicts: https://help.github.com/articles/dealing-with-line-endings/#re-normalizing-a-repository