change in peller
merged conflict in peller
Merge branch 'master' of https://github.com/spthm/bc-ethz