small change
Merge remote-tracking branch 'origin/master'

Conflicts:
	MutualFund/WebContent/WEB-INF/classes/controller/ViewAccountAction.class
	MutualFund/WebContent/WEB-INF/classes/model/Model.class
	MutualFund/WebContent/WEB-INF/classes/model/PositionDAO.class
Merge branch 'master' of https://github.com/tzheng/A-Web-Project.git

Conflicts:
	MutualFund/WebContent/WEB-INF/classes/controller/ViewAccountAction.class
	MutualFund/WebContent/WEB-INF/classes/databean/CustomerBean.class
	MutualFund/WebContent/WEB-INF/classes/model/CustomerDAO.class
	MutualFund/WebContent/WEB-INF/classes/model/TransactionDAO.class