.gitignore is now working
test and fixes after merge