nteste
Merge origin/master
Alteração ás classes nucleares
Merge origin/master
Merge origin/master
Alteração ás classes nucleares
Merge origin/master
Merge origin/master

Conflicts:
	src/projectogetplay/Playlist.java
Merge origin/master
Merge origin/master

Conflicts:
	src/projectogetplay/Playlist.java