* Git arrombado

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

Conflicts:
	OldButGold/src/GUI/GUI.java
	OldButGold/src/db/Database.java
Merge branch 'master' of https://github.com/thiagomartins89/EngSoft-dos-brothers
Merge branch 'master' of https://github.com/thiagomartins89/EngSoft-dos-brothers
* Agora a janela é aberta pela Main.java

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

Conflicts:
	OldButGold/bin/GUI/JanelaLogin.class
	OldButGold/bin/GUI/Main.class