modified:   HTA/index.hta
	modified:   Projects/ProjectLifecycleDocuments.xml
Merge branch 'master' of https://github.com/UMDSeniorDesign/Lifecycledocs

Conflicts:
	HTA/index.hta
	.git/MERGE_HEAD