commiting .workspace to fix conflicts
removed .idea
Added idea & sass-cache to gitignore