Added a complete .gitignore file.
Trying to fix a merge error.
Merge complete.