new
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Calculate.java
problem
new version

Änderungen an Calculate