Merge pull request #70 from seavor/polina

Make total price calculation not a total nightmare
Merge pull request #71 from seavor/jay

Jay