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

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