Adding showAlbum, changing a bit style
Making changes on show albums
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'