Commit tese (te amo idiota)
correçao
Merge branch 'master' of https://github.com/raulsola/allTogether.git

Conflicts:
	src/br/com/alltogether/Main.java
Main