Itroduced albumView for showing contents of an Album.
Solving merge conflicts.
Added the photo views html and the corresponding view functions.