Arreglo FTP

Arreglo objetos y conprobacion de order leida
Merge branch 'entrega2' of https://github.com/jmvalenz/taller-integracion into entrega2

Conflicts:
	app/models/order.rb