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

Conflicts:
	file_sandro.txt
another merger

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

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