Projects sass
Sass
Merge branch 'master' of github.com:janvdt/SparkCoin

Conflicts:
	vendor/autoload.php
	vendor/composer/autoload_real.php