File changed
Merge branch 'master' of github.com:spthm/bc-ethz

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

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