Fix file permissions and line terminations
Preparing merge
Merge remote-tracking branch 'upstream/master'
Completing merge
Preparing merge
Merge remote-tracking branch 'upstream/master'
Completing merge
Merge remote-tracking branch 'upstream/master'
Merge pull request #63 from ellert/master

Fix file permissions and line terminations