Changed bottom button on step 3 and commented out payment options on step 4 controller
Changes to final view calculations
Changed shipping options
Merge branch 'hchanges' of https://github.com/qawemlilo/clonard into hchanges
Successfully implemented changes requested by client sept-nov
Merge branch 'special-instructions' into payoptions
Made changes on the admin side
Changed Agriculture to Technology in step 2
Changed Agriculture to Technology in step 2 and merged to payoptions