deploy problem
AuthorswasDumb migration commented out
Merge branch 'master' of https://github.com/brotherclone/imaginary

Conflicts:
	app/controllers/promocards_controller.rb
	app/models/promocard.rb
	app/views/promocards/_form.html.haml
	app/views/promocards/edit.html.haml
	app/views/promocards/index.html.haml
	app/views/promocards/new.html.haml
	app/views/promocards/show.html.haml
	db/development.sqlite3
	db/migrate/20141114191353_authorswasdumb.rb
	db/schema.rb