Fixing borked merge with gitignore and readme.md