DAO
s
s
merge commit from Zhen
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/controller/Controller.java
Merge branch 'master' of https://github.com/wondermac/Task7-Repo