Blockchain hooked in
Merge branch 'master' of https://github.com/puffball/freebeer

Conflicts:
	js/puffballPlatform/puffball.js
Modified BLOCKS format and relevant methods
Merge branch 'master' of https://github.com/puffball/freebeer

Conflicts:
	js/puffballPlatform/puffball.js