Make a conflict
Merge branch 'master' of github.com:ProjectGig/DMS

Conflicts:
	HAP-plan.docx