Init
Empty problem solved
merge
Merge branch 'master' of https://github.com/kelvinih/RubyOnRails

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/models/product.rb
	app/views/layouts/application.html.erb
	app/views/products/_form.html.erb
	app/views/products/index.html.erb
	config/initializers/secret_token.rb
	config/routes.rb
	db/schema.rb
	public/stylesheets/depot.css
	test/controllers/products_controller_test.rb
	test/fixtures/products.yml
	test/models/product_test.rb