Fix Heroku
Add additional attrs to Album model
Add search route to albums
Remove plugins
remove oudated rails 2.3 stuffwq
Heroku fix (I think?)
Add annotate gem
Merge branch 'master' of github.com:allynfolksjr/Celluloid

Conflicts:
	config/application.rb
Update schema.rb
Update binstubs with annotate and pry
Bring schema to latest version
Bringing in branches
Merge branch 'users'

Conflicts:
	app/models/album.rb
	app/views/albums/show.html.erb
	db/schema.rb
Merge branch 'master' of github.com:allynfolksjr/Celluloid
schema fixes
updated schema
merged schema
Fix schema
Consolidate specs
Fix broken spec
remove discogs helper