ignore
ignore
replaced by sass-files
Merge origin/master into master-local

Conflicts:
	.gitignore
Merge pull request #2 from stritti/master

merge to master