yeah
Merge branch 'master' of git@github.com:tzheng/A-Web-Project.git
Merge branch 'master' of git@github.com:tzheng/A-Web-Project.git
test on template-customer
Merge branch 'master' of git@github.com:tzheng/A-Web-Project.git

Conflicts:
	MutualFund/WebContent/WEB-INF/classes/formbean/SellFundForm.class
	MutualFund/WebContent/WEB-INF/classes/model/Model.class
	MutualFund/WebContent/WEB-INF/classes/model/PositionDAO.class
	MutualFund/WebContent/WEB-INF/classes/model/TransactionDAO.class
	MutualFund/WebContent/template-customer.jsp