Albums

I want to merge albums into master