Merge branch 'master' of C:\Users\Chris\Projects\CodeNarc\CodeNarc-GitHub with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
#43: FileEndsWithoutNewline rule (formatting). (Joe Sondow)