Ignore editor backup files
Code merge
Add frereth-common to the build