Added attributes to enforce lf workflow
Modified .gitignore
Merge branch 'master' of https://github.com/dmtaylor/cmps111-proj4