marissa's updates
Merge branch 'master' of https://github.com/TechTrinkets/techtrinkets

Conflicts:
	build/web/billing.jsp
	build/web/confirmation.jsp
	web/billing.jsp
	web/confirmation.jsp