aa
Merge branch 'master' of https://github.com/gdmc-louis/GraduateWork.git

Conflicts:
	src/hibernate.cfg.xml