schema update
Albums working properly
Merge branch 'music'
merging music
Conflicts:
	app/models/collection.rb
	app/views/collections/show.html.haml
	config/routes.rb
	db/schema.rb
Movies working properly
Merge branch 'movies'
merging movies