Fix merge conflicts
Merge branch 'master' of https://github.com/offlinehacker/miner.litecoin.si

Conflicts:
	miner.nix