Show and calculate subtotal
Added taxes functionality for diff countries
Refactored code to use discount hash
Finished
Merge pull request #1 from dario-c/jane

Jane - merge to master