Update a Rails4... Un nuevo inicio...
README update
Update
Update de gemas (Rails 4.0.2)
Merge branch 'master' of github.com:Shelvak/x0y0

Conflicts:
	Gemfile
	Gemfile.lock
	README.rdoc
	app/assets/stylesheets/jquery-customs/ui-custom.css.erb
	app/assets/stylesheets/jquery/ui-custom.css.erb
	app/inputs/date_picker_input.rb
	app/inputs/datetime_picker_input.rb
	config/initializers/devise.rb
	test/integration/public_user_interactions_test.rb
	vendor/assets/stylesheets/jquery/ui-custom.css.erb
Capifying... (3.0)