Se actulizo la gema spree_comments
Arrgle los conflictos que me marco localmente
Merge branch 'master' into ol
borre una migracion duplicada 20130515191112_add_user_id_and_deleted_at_to_addresses.spree_address_book.rb
 y actualize el development.sql
Merge con master actualizado
Se modifico el mail
conflicto con app/views/spree/addresses/_form.html.erb era solo una linea hago comit para cambiarme a mi branch y hacer merge
Merge branch 'master' into old_order_comments
Actualizcion de spree_commnets gem
load essentials
Merge branch 'SeedTask'

-- Merging seed task load essentials
merge with master
set layout and updating README
Merge branch 'SeedTask'

-- Set layout by default
Merge branch 'master' of github.com:gtovar/bebitos

-- before set layout
set country MX
Merge branch 'SeedTask'

-- Set Country Default
without set prefix bebitos_
without set prefix bebitos_
Merge branch 'SeedTask'

-- without prefix bebitos_