成果物
Merge branch 'master' of https://github.com/ikageso1/LabNav

Conflicts:
	specifications.odt
	specifications.pdf