committing for pull; these likely shouldn't be in the repo
Merge branch 'master' of github.com:wholcomb/food_circles

Conflicts:
	log/development.log
	tmp/pids/server.pid
Merge branch 'master' of github.com:wholcomb/food_circles

Conflicts:
	db/schema.rb
	log/development.log
	tmp/pids/server.pid
adding image to offer
adding s3 authentication info