Will's commit.
Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz
resovled conflict in Gregor.py
Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz
nothing
.
Merge branch 'master' of https://github.com/spthm/bc-ethz
Merge branch 'master' of https://github.com/spthm/bc-ethz