dfsd
dsfMerge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb
	db/schema.rb
sdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/routes.rb
	db/migrate/20140904154150_create_inyx_employees_rails_employees.inyx_employees_rails.rb
fd
Merge remote-tracking branch 'origin/master'
paginacion