.gitignore is now working
merge