commit actualizaciones...
Merge branch 'master' of https://github.com/aspgems/skeleton

Conflicts:
	Gemfile
	Gemfile.lock