Functional Specs Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final Deliverables/Functional Specs V1.0.docx