Buh
Merge branch 'wip' of https://github.com/krokis/byron into wip

Conflicts:
	package.json