Commit 2
Commit 3
Commit 3
Revert "Commit 3"

This reverts commit 1d87dd347cf8f5ca3b988aa8fe66404ef7f4b70e.
Merge origin/master

Conflicts:
	src/controller/LoginController.java
Teste