Merge branch 'master' of https://github.com/thuyihan1206/tough-udder

Conflicts:
	build/web/WEB-INF/classes/toughudder/Controller.class
	build/web/WEB-INF/classes/toughudder/CreditCardInfoBean.class
	build/web/WEB-INF/classes/toughudder/EmailWorkerBean.class
	build/web/checkout.jsp
	build/web/confirmation.jsp
	src/java/toughudder/Controller.java
	src/java/toughudder/CreditCardInfoBean.java
	src/java/toughudder/CreditCardWorkerBean.java
	src/java/toughudder/EmailWorkerBean.java
	web/checkout.jsp
	web/confirmation.jsp