*que foi?
Merge branch 'master' of https://github.com/thiagomartins89/EngSoft-dos-brothers

Conflicts:
	OldButGold/src/GUI/Main.java
Merge branch 'master' of https://github.com/thiagomartins89/EngSoft-dos-brothers
Merge branch 'master' of https://github.com/thiagomartins89/EngSoft-dos-brothers
commit to merge

Signed-off-by: Guilherme Grünewald <g.grunewald@gmail.com>
Merge branch 'master' of https://github.com/thiagomartins89/EngSoft-dos-brothers

Conflicts:
	OldButGold/.classpath
* CtrlUserLogin implementado.

Signed-off-by: Guilherme Grünewald <g.grunewald@gmail.com>
Merge branch 'master' of https://github.com/thiagomartins89/EngSoft-dos-brothers

Conflicts:
	OldButGold/.classpath

Signed-off-by: Guilherme Grünewald <g.grunewald@gmail.com>