messing around with Blake
Merge remote-tracking branch 'origin/master'

Conflicts:
	quark/cuda_quark_blake512.cu