updated
updated
Merge branch 'master' of https://github.com/seadraa/rp2zero_calculator

Conflicts:

.metadata/.plugins/org.eclipse.core.resources/.projects/rp2zero/.markers
.snap

.metadata/.plugins/org.eclipse.core.resources/.projects/rp2zero/.syncinf
o.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.cor
e.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi