Album anzeigen und erstellen
Merge branch 'master' of https://github.com/B5istToll/B5_flickr_Client

Conflicts:
	sinatra.rb
	views/album.erb