.gitignore is now working
sorted merge