commit global con consola
Merge branch 'master' of https://github.com/aspgems/skeleton

Conflicts:
	Gemfile
	Gemfile.lock
commit gem file sent by pilar