Sexto cambio en rama master
Merge branch 'master' of git@github.com:festradasolano/stm3.git

Conflicts:
	stm3/src/main/Main.java