bug-1 risolto
feature-2
testtest
testtest
Merge feature-2

Conflicts:
	first/first/src/main/java/it/filo/ooad/first/Feature1Class.java
Merge bug-1

Conflicts:
	first/first/src/main/java/it/filo/ooad/first/Feature1Class.java