Classes Arquivo e Conta.
Merge branch 'master' of https://github.com/AnaLucia/playit.git
Classes Arquivo e Conta. Mudanças na classes Usuario.
Merge branch 'master' of https://github.com/AnaLucia/playit.git

Conflicts:
	playIt/src/classes/Main.java
	playIt/src/classes/Usuario.java