Created functionality that makes the user choose a playlist to play
fixing merge issues