Começando US2
Merge https://github.com/BrunoRafael7/lab3
.cacha q modifica sozin...
Merge https://github.com/BrunoRafael7/lab3

Conflicts:
	DisciplinesManager/.cache
Merge https://github.com/BrunoRafael7/lab3
merg do .cache
bug