text
Merge branch 'master' of https://github.com/spthm/bc-ethz

Conflicts:
	cbruderer.txt
Merge branch 'master' of https://github.com/spthm/bc-ethz

Conflicts:
	cbruderer.txt
Merge branch 'master' of https://github.com/spthm/bc-ethz

Conflicts:
	cbruderer.txt
Merge branch 'master' of https://github.com/spthm/bc-ethz