Merge Joshj5hawk-master, line-endings =P