require user to confirm photo
image uploads work
include test image
add application.yml.example back
dumb copy/paste error
other features no longer broken
ignore uploads
fixed merge conflicts
fixed more merge conflicts
fixed feature failures
Clean up testing and refine before_filter.
Refactor to use carrierwave's remote file upload and more consistent
naming.
Merge branch 'mkunkel'

* mkunkel:
  Refactor to use carrierwave's remote file upload and more consistent naming.
  Clean up testing and refine before_filter.
  fixed feature failures
  fixed more merge conflicts
  ignore uploads
  other features no longer broken
  dumb copy/paste error
  add application.yml.example back
  include test image
  image uploads work
  require user to confirm photo

Conflicts:
	app/models/user.rb
	db/schema.rb
	features/instructor_marks_materials_as_covered.feature
	features/step_definitions/authentication_steps.rb