Fixed my file
Fixed my file
Finally fixed merging issue
Finally fixed merging issue
Quiet!
Merge branch 'master' of https://github.com/spthm/bc-ethz