Update .gitignore
moving to sass
merge fixes