Updated .gitignore and merged style.css with grayscale.css