etters adding a line to adels file
cleanup the conflict
Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz