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

Conflicts:
	app/views/splashpage.blade.php