Made a .gitignore to avoid merging errors