Merge branch 'master' into style

Conflicts:
	app/assets/stylesheets/application.scss
Fix bug issue on products page
Line Items
Merge branch 'stripe' into style

Conflicts:
	app/assets/stylesheets/application.scss
Small changes to style and charges controller
Merge branch 'stripe' into style
Add dashboard for buyers
vendor comiled assets
Precompile assets
ADd heoku gem
Merge remote-tracking branch 'origin/master'
Add unicorn
add .env to .gitignore
use unicorn via procfile
Gemfile updates
Update Gemfile
Remove update from user
Update css
Fix hilarious css errors and precompile