test
Merge branch 'master' of
https://github.com/mateuszstanuszek/kalkulator.git

Conflicts:
	src/main/java/com/matus/calculator.java
test