<DE2> Database
Merge remote-tracking branch 'origin'
Merge branch 'master' of https://github.com/Ilikecattle/EECE381Module2
<Android & DE2> Playlists loaded and save