This
Merge branch 'master' of https://github.com/Indi44137/assignment.git

Conflicts:
	Currency extension.py