Line

asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	Geometri/bin/geometri/Oval.class
Merge branch 'master' of https://github.com/Tazoq/TDA550

Conflicts:
	Geometri/bin/geometri/Oval.class
	Geometri/bin/geometri/Square.class