Update .gitattributes to fix line endings issue
Normalize line endings
Merge pull request #221 from YaleSTC/readme_edits

Added a section on setting up shifts on a local machine for development
Add comment in .gitattributes with link to source of the template
Merge pull request #220 from YaleSTC/217_line-endings

Resolves Issue #217, where differences between LF vs. CRLF line endings on local machines resulted in 'git status' reporting phantom modifications.
Correct typos
Temporary modification of .gitattributes in order to pull the rails-3.2 branch without line endings getting in the way
Fix merge conflict in .gitattributes