Creating a conflict
Removed farzana.txt file
Merge branch 'master' of https://github.com/spthm/bc-ethz

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