Merge pull request #69 from seavor/jay

cleanup
Make total price calculation not a total nightmare
Merge branch 'polina' of github.com:seavor/fatapp into jay

Conflicts:
	webapp/js/main.js