マルチマーカの実装
コンフリクトの修正
Merge branch 'master' of https://github.com/hatt0519/physical_assessment

Conflicts:
	physical_assessment/physical_assessment.cpp
	physical_assessment/physical_assessment.vcproj