Added albums and albums_songs table
Resolved merge conflicts