Added small changes
Merge branch 'master' of github.com:yetti4/bitcoin

Conflicts:
	js/scripts.js