arreglando mi gemfile para que me funcione
Merge branch 'master' of https://github.com/openjaf/cuban_swing

Conflicts:
	Gemfile
	Gemfile.lock