changes in tax
remove conflicts 9-jul
Merge pull request #97 from vaibhavcisin274/anshul

Anshul