Altera tela
Merge branch 'master' of https://github.com/grossi/EngenhariaSoftwareT1

Conflicts:
	1213094/src/DatabaseOperator.java
	1213094/src/InitialScreen.java
	1213094/src/Main.java
	1213094/src/ProjectScreen.java