bean
Merge branch 'master' of git@github.com:tzheng/A-Web-Project.git

Conflicts:
	MutualFund/WebContent/WEB-INF/classes/model/CustomerDAO.class
	MutualFund/WebContent/WEB-INF/classes/model/EmployeeDAO.class
	MutualFund/WebContent/WEB-INF/classes/model/TransactionDAO.class
	MutualFund/src/model/TransactionDAO.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	MutualFund/WebContent/WEB-INF/classes/controller/Controller.class
	MutualFund/WebContent/WEB-INF/classes/model/CustomerDAO.class
	MutualFund/WebContent/WEB-INF/classes/model/EmployeeDAO.class
	MutualFund/WebContent/WEB-INF/classes/model/Model.class
	MutualFund/WebContent/WEB-INF/classes/model/TransactionDAO.class
	MutualFund/src/controller/Controller.java