get images working
Merge branch 'master' of github.com:wildfauve/mycards

Conflicts:
	.DS_Store
	Gemfile
	Gemfile.lock
	app/.DS_Store
	app/assets/.DS_Store
	app/assets/javascripts/.DS_Store
	app/assets/javascripts/application.js
	app/assets/javascripts/jqcloud-1.0.1.js
	app/assets/javascripts/jquery.tokeninput.js
	app/assets/javascripts/jquery.tools.min.js
	app/assets/stylesheets/.DS_Store
	app/assets/stylesheets/tokeninput/.DS_Store
	app/controllers/application_controller.rb
	app/controllers/gridfs_controller.rb
	app/models/picture.rb
	app/models/tag.rb
	app/views/cards/_list_header.html.erb
	app/views/layouts/application.html.erb
	config/application.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/dragonfly.rb
	config/initializers/inflections.rb
	config/initializers/secret_token.rb
	config/mongoid.yml
	config/routes.rb
	public/500.html