Merge pull request #1 from Siesna/master

merging changes from afternoon
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 pull request #2 from Siesna/master

importing seeds file
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
adding offers configuration pages
adding categories
adding vouchers to repsent available offers
adding payments
formatting offers
merging changes from jaime
Merge branch 'master' of https://github.com/Siesna/food_circles

Conflicts:
	log/development.log
	tmp/dragonfly/cache/meta/0f/2c76a896b5bd3fd00bcd2cd073a163459c4f22
	tmp/dragonfly/cache/meta/13/8753365035b9458090e89d4a033c67f259ccef
	tmp/dragonfly/cache/meta/20/29eb890eee7e3503801d02fab3c1509181cc40
	tmp/dragonfly/cache/meta/25/7945f5a44fd52c9274c2e61ffcfff573980ae4
	tmp/dragonfly/cache/meta/28/bc8ee0753405030f1d5a42656f8bc9b40f252c
	tmp/dragonfly/cache/meta/44/482ae4805c49fe100619d572334c1da5f9b226
	tmp/dragonfly/cache/meta/47/676e1b9608d4c4f048c346a2e4246c5363a1a5
	tmp/dragonfly/cache/meta/5f/c19e7f52a93248073f4fccfa34d43d8450b12c
	tmp/dragonfly/cache/meta/66/f44aba1428593600ff0e47ea6aa54362e39a59
	tmp/dragonfly/cache/meta/67/3fe37af7fb0f88e6110a85f883b9462618d2c5
	tmp/dragonfly/cache/meta/75/933d3cefddc5e90569eef94933e785a98c9b62
	tmp/dragonfly/cache/meta/7b/b72e5af36f2775d0fb29cdfd6afd42f9ee7c7b
	tmp/dragonfly/cache/meta/80/5841ac20acdd8dd41460c8346294abc5c4dd8f
	tmp/dragonfly/cache/meta/95/cddc9edb46e8309072d9b15ee569957f907e75
	tmp/dragonfly/cache/meta/96/29fe966dfd70fec24fc05e9bd69d681e117d11
	tmp/dragonfly/cache/meta/96/66bdde7630b008e8ee2e651a0d37aa7842fd12
	tmp/dragonfly/cache/meta/ae/090a86f710ad1cf526d32ced1c5c401139235d
	tmp/dragonfly/cache/meta/b4/d37198ddf7b3bc227e185124c0dd84a931d02f
	tmp/dragonfly/cache/meta/cf/ac1ee7b5f42207cbdc9abebff2b4ae36389ce3
	tmp/dragonfly/cache/meta/d4/703e91f8a2e54630502c7946d27e0e5d2b27eb
	tmp/dragonfly/cache/meta/e0/b6836bfd7815505b4a39a362d7898e91e14b4e
	tmp/dragonfly/cache/meta/e2/67d952f4383fb817f496e5493bb213e2ffe2f2
	tmp/dragonfly/cache/meta/e4/9f8c7819a813d6b1b45ddd6046979307f585dd
	tmp/dragonfly/cache/meta/e8/ccacc317c9a048fe5fb49ae13adbe85722bb2c
	tmp/dragonfly/cache/meta/ee/fe74949a8c2a0bbc077385a12944d9f98a12e0
	tmp/dragonfly/cache/meta/f2/ec320822ca5803aa545b483a9e56ac7882923e
	tmp/dragonfly/cache/meta/f7/e10df1a224a71a5684bcb9b7d19ed0c6863816
	tmp/dragonfly/cache/meta/f9/67ac04386c59253bd80f4034d18af166cc5691
	tmp/dragonfly/cache/meta/fe/486c5c0028ef6882dce40b3c2371c99b9893d7
	tmp/pids/server.pid
adding num_users for display on mobile signup
switching from offers to vouchers
adding vouchers
Merge branch 'master' of https://github.com/Siesna/food_circles

Conflicts:
	tmp/pids/server.pid
adding payments to offers
integrating offers into timeline