wrong
Merge branch 'master' of git@github.com:wgychris/Task7.git

Conflicts:
	MutualFund/WebContent/WEB-INF/web.xml
	MutualFund/src/model/Model.java