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

Conflicts:
	mutualFundWeb/src/Struts/Action/EmployeeAction.java
	mutualFundWeb/src/struts.xml