Photo stuff works again
Merge branch 'master' of https://github.com/msondheimer/web_dev_final

Conflicts:
	CONpetence/Gemfile
	CONpetence/app/controllers/characters_controller.rb
	CONpetence/app/views/characters/edit.html.erb
	CONpetence/app/views/characters/index.html.erb
	CONpetence/app/views/characters/new.html.erb
	CONpetence/app/views/characters/show.html.erb
	CONpetence/app/views/users/_form.html.erb
	CONpetence/app/views/users/edit.html.erb
	CONpetence/app/views/users/new_user.html.erb
	CONpetence/db/migrate/20140313201322_add_column_to_character.rb
	CONpetence/public/images/ajax-loader.gif
	CONpetence/public/stylesheets/chain_selects.css
	CONpetence/vendor/plugins/ChainSelects/CHANGELOG
	CONpetence/vendor/plugins/ChainSelects/MIT-LICENSE
	CONpetence/vendor/plugins/ChainSelects/README
	CONpetence/vendor/plugins/ChainSelects/Rakefile
	CONpetence/vendor/plugins/ChainSelects/copy_files.rb
	CONpetence/vendor/plugins/ChainSelects/generators/chain_selects/USAGE

CONpetence/vendor/plugins/ChainSelects/generators/chain_selects/chain_se
lects_generator.rb

CONpetence/vendor/plugins/ChainSelects/generators/chain_selects_route/ch
ain_selects_route_generator.rb
	CONpetence/vendor/plugins/ChainSelects/init.rb
	CONpetence/vendor/plugins/ChainSelects/install.rb

CONpetence/vendor/plugins/ChainSelects/lib/app/controllers/chain_selects
_controller.rb

CONpetence/vendor/plugins/ChainSelects/lib/app/helpers/chain_selects_hel
per.rb

CONpetence/vendor/plugins/ChainSelects/lib/app/views/chain_selects/query
.erb
	CONpetence/vendor/plugins/ChainSelects/lib/chain_selects.rb

CONpetence/vendor/plugins/ChainSelects/lib/chain_selects/acts_as_chainab
le.rb
	CONpetence/vendor/plugins/ChainSelects/lib/chain_selects/commands.rb
	CONpetence/vendor/plugins/ChainSelects/lib/chain_selects/routing.rb

CONpetence/vendor/plugins/ChainSelects/lib/public/images/ajax-loader.gif

CONpetence/vendor/plugins/ChainSelects/lib/public/stylesheets/chain_sele
cts.css
	CONpetence/vendor/plugins/ChainSelects/rails/init.rb
	CONpetence/vendor/plugins/ChainSelects/tasks/chain_selects_tasks.rake
	CONpetence/vendor/plugins/ChainSelects/test/acts_as_chainable_test.rb

CONpetence/vendor/plugins/ChainSelects/test/chain_selects_helper_test.rb

CONpetence/vendor/plugins/ChainSelects/test/chain_selects_plugin.sqlite3
.db
	CONpetence/vendor/plugins/ChainSelects/test/chain_selects_test.rb
	CONpetence/vendor/plugins/ChainSelects/test/database.yml
	CONpetence/vendor/plugins/ChainSelects/test/routing_test.rb
	CONpetence/vendor/plugins/ChainSelects/test/schema.rb
	CONpetence/vendor/plugins/ChainSelects/test/test_helper.rb
	CONpetence/vendor/plugins/ChainSelects/uninstall.rb