GREEN

GREEN
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Tests/Constructor.java
	src/calculator/Calculator.java
FIX

FIX