4
4.1
Merge branch 'master' of ssh://github.com/andtorg/pizzatest

Conflicts:
	pizzatest/src/it/vagma/pizzatest/Pizza.java

new commit after conflicts