d
Merge branch 'master' of
https://github.com/wangzhenhuaCode/mutualFundWebsite.git

Conflicts:
	mutualFundWeb/src/Struts/Action/CustomerAction.java
	mutualFundWeb/src/Struts/Action/EmployeeAction.java
Merge branch 'master' of https://github.com/wangzhenhuaCode/mutualFundWebsite.git
C
Merge branch 'master' of
https://github.com/wangzhenhuaCode/mutualFundWebsite.git

Conflicts:
	mutualFundWeb/WebContent/employee_fund.jsp
	mutualFundWeb/src/Struts/Action/CustomerAction.java
	mutualFundWeb/src/Struts/Action/EmployeeAction.java
Merge branch 'master' of
https://github.com/wangzhenhuaCode/mutualFundWebsite.git

Conflicts:
	mutualFundWeb/src/Struts/Action/FinanceAction.java