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

Conflicts:
	MutualFund/src/model/PositionDAO.java
Merge branch 'master' of git@github.com:wgychris/Task7.git
not work daisy change fang
Daisy changed fang not work