Added N adjust for scrypt.c
Changed algorithm
Merge branch 'master' of https://github.com/bountycoin/cgminer-mod

Conflicts:
	scrypt.c