added comments
Merge branch 'master' of https://github.com/hitek/Group2.git

Conflicts:
	src/data/UserDAO.java