2
Merge branch 'master' of https://github.com/perakojot/FigureProject

Conflicts:
	qml/FigureCounter/main.qml