modified:   Gemfile
	modified:   Gemfile
	modified:   Gemfile
	new file:   app/assets/javascripts/timeplug/jquery-1.7.1.min.js
	new file:   app/assets/javascripts/timeplug/jquery-ui-1.8.17.custom.min.js
	new file:   app/assets/javascripts/timeplug/jquery-ui-timepicker-addon.js
	new file:   app/assets/javascripts/timeplug/jquery-ui-timepicker-zh-CN.js
	new file:   app/assets/stylesheets/timeplug/jquery-ui-1.8.17.custom.css
	new file:   app/assets/stylesheets/timeplug/jquery-ui-timepicker-addon.css
	modified:   app/controllers/manco_controller.rb
	modified:   app/controllers/patch/profiles_controller.rb
	modified:   app/controllers/store/cart_controller.rb
	modified:   app/controllers/store/goods_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/models/ecstore/good.rb
	modified:   app/views/layouts/manco_template.html.erb
	modified:   app/views/manco/_black_index.html.erb
	new file:   app/views/manco/_blackgood_add.html.erb
	new file:   app/views/manco/_show_carblack.html.erb
	new file:   app/views/manco/black_good_index.html.erb
	modified:   app/views/manco/black_index.erb
	new file:   app/views/manco/blackboardfind_e.js.erb
	modified:   app/views/manco/blackbord.html.erb
	new file:   app/views/manco/blackbord_add.html.erb
	new file:   app/views/manco/blackgood_add.html.erb
	modified:   app/views/manco/find_manco.html.erb
	new file:   app/views/manco/good_source.html.erb
	modified:   app/views/manco/index.html.erb
	new file:   app/views/manco/show_carblack.html.erb
	modified:   app/views/manco/user.html.erb
	modified:   app/views/patch/profiles/mancouser.html.erb
	new file:   app/views/patch/profiles/mancouser_add.html.erb
	modified:   app/views/store/cart/manco_black_buy.html.erb
	modified:   app/views/store/goods/mancoproduct.html.erb
	new file:   app/views/store/goods/show_goodblack.html.erb
	modified:   app/views/store/orders/black_manco.erb
	new file:   app/views/store/orders/goodblack.html.erb
	modified:   config/routes.rb
	modified:   db/schema.rb
	app/assets/stylesheets/timeplug/images/
	app/models/ecstore/black_good.rb
	db/migrate/20140902032540_add_member_id_to_goods.rb
	db/migrate/20140903052445_create_black_goods.rb
Merge branch 'master' of https://github.com/jason0037/vt