Scaffold del Ruteador
Merge branch 'master' of github.com:LogicalBricks/ejemplo-taller

Conflicts:
	Gemfile