Merge pull request #1006 from lynnaloo/master
authorTravis Webb <travis@traviswebb.com>
Sun, 3 Nov 2013 20:30:28 +0000 (12:30 -0800)
committerTravis Webb <travis@traviswebb.com>
Sun, 3 Nov 2013 20:30:28 +0000 (12:30 -0800)
Fixed .gitattributes file


Trivial merge