changed
Merge branch 'master' of https://github.com/spthm/bc-ethz
try merge
Merge branch 'master' of https://github.com/spthm/bc-ethz

Conflicts:
	cbruderer.txt

greetings!
Merge branch 'master' of https://github.com/spthm/bc-ethz
greetings!
Merge branch 'master' of https://github.com/spthm/bc-ethz
again
Merge branch 'master' of https://github.com/spthm/bc-ethz
...
Merge branch 'master' of https://github.com/spthm/bc-ethz