mudanças syso
add string main
Merge branch 'branch'

Conflicts:
	bin/main.class
	src/main.java
Merge branch 'master' of https://github.com/Kat2/Metodosgit

Conflicts:
	bin/main.class
	src/main.java