merge
merge
added directive to convert dollars to costarican colones