Edits to products and supply lists show pages
Initial setup
Add charges controller
Add Stripe payment and Figaro for enviornment variables
Add rspec
Add line item model and relationships
Add ability for users to purchase a product
Add Invoice model
Add template home page
Refactor navbar
Add new invoice on successful charge
Merge branch 'home_page'

Conflicts:
	app/assets/stylesheets/application.scss
	app/controllers/invoices_controller.rb
	config/initializers/stripe.rb
Refactor sign in forms
Add form validation for signin
Merge remote-tracking branch 'origin/master' into sign_in

Conflicts:
	Gemfile.lock
	app/assets/javascripts/invoices.js.coffee
	app/assets/stylesheets/application.scss
	app/assets/stylesheets/invoices.css.scss
	app/assets/stylesheets/products.css
	app/assets/stylesheets/products.css.scss
	app/controllers/farms_controller.rb
	app/models/metro.rb
	app/models/product.rb
	app/views/layouts/_navbar.html.erb
	app/views/metros/index.html.erb
	app/views/products/index.html.erb
	app/views/supply_lists/index.html.erb
	db/schema.rb
Merge pull request #36 from bird-man-jr/sign_in

Sign in