Fix merge conflict
Merge pull request #93 from rserna2010/order_scenario

Add debit & credit orders to scenarios