6to cambio rama master
Merge branch 'master' of git@github.com:rakzo/stm3_test.git

Conflicts:
	stm3_test/src/main/main.java