.gitignore is now working.
redid the merge