git
ukh
Merge branch 'master' of https://github.com/janvdt/SparkCoin

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