I don't even know what this file was.
Merge branch 'master' of github.com:dschleck/edith