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

Conflicts:
	public/css/all.css
	public/sass/pages/_home.scss