Stop tracking unneeded files
gitignore
merge 'master'
gitignore