.idea crap
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/sass_stdlib.xml
	.idea/scopes/scope_settings.xml
	.idea/workspace.xml
Foreground layer