pulling from bigcommerce
adding liquid
adding uploads
boostrap
merging in from laptop, going to be a total mess
Merge branch 'master' of https://github.com/patrickmcguire/realdropship

Conflicts:
	Gemfile.lock
	app/models/customer_order.rb
	db/schema.rb
	lib/tasks/import.rake