Update
Merge branch 'master' of https://github.com/matthewganpat/info3440project

Conflicts:
	Software_Development_Plan.docx
Merge branch 'master' of https://github.com/matthewganpat/info3440project

Conflicts:
	Software_Development_Plan.docx