add all files
delete all ~files
Merge branch 'master' of https://github.com/d4mk0/depot

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/store.js.coffee
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/store.css.scss
	app/controllers/application_controller.rb
	app/controllers/products_controller.rb
	app/controllers/store_controller.rb
	app/helpers/application_helper.rb
	app/models/product.rb
	app/views/layouts/application.html.erb
	app/views/store/index.html.erb
	config/environment.rb
	config/routes.rb
	db/schema.rb
	test/functional/store_controller_test.rb
	test/test_helper.rb
add all
rm all ~