Update de gemas (Rails 4.0.2)
Merge branch 'master' of github.com:Shelvak/x0y0

Conflicts:
	Gemfile
	Gemfile.lock
Preparando terreno para las N-variedades
N-varieties done =D