importing reciept functionality
moving to erb
showing all offers for a venue
redirecting to timeline upon completion
switching to foodcircles keys
adding coupon code
merging upstream changes
Merge branch 'master' of github.com:FoodCircles/food_circles

Conflicts:
	app/controllers/popups_controller.rb
	log/development.log