PNColuna(Merge com conflito)
PNColuna(Merge com conflito)
Interface painel fundo
Merge origin/master

Conflicts:
	src/projectogetplay/Playlist.java
	src/projectogetplay/PnColuna.java
	users.dat