Updated gitignore, too many conflicts in compiled css