Gemfile is crazy
Merge branch 'master' of github.com:danielgracia/LUW

Conflicts:
	Gemfile.lock
Gemlock again