edit gitignore
Add DAL: recent songs, new songs
resolve conflict
resolve conflict
resolve