Agregar relación de Registro con Movimiento
Merge branch 'master' of github.com:LogicalBricks/charybox

Mezclando cambios de master
Agregando calculo de monto para el modelo registro
Devise views and config for multiple templates
Merge branch 'master' of github.com:LogicalBricks/charybox
Devise views for not logged_in user
Flujo parcial de la vista mostrar registro.
Merge branch 'master' of github.com:LogicalBricks/charybox

Conflicts:
	app/models/registro.rb
merge with branch origin/master