adding *.css to gitignore
adding *.css to gitignore
Merge branch 'master' into layout-3