start adding aggression
Merge branch 'master' into aggression

Conflicts:
	ICU-Miner.cpp
	cudamining.vcxproj
	cudastuff.cu
...
fix hash rate output
Merge branch 'aggression'

Conflicts:
	ICU-Miner.cpp