New chain params attempted
Merge branch 'master' of github.com:torcoinj/torcoin

Conflicts:
	src/chainparams.cpp