Changes
Merge branch 'Addition' of https://github.com/Johca/Minira-knare-Grupp-6 into Addition

Conflicts:
	Miniräknare-addition.py