merge
Merge branch 'master' of https://github.com/bcpki/bitcoin
script.h
Merge branch 'master' of https://github.com/bcpki/bitcoin

Conflicts:
	src/script.h