おｋ
ｈ
Merge branch 'master' of https://github.com/HewPenguin/develop

Conflicts:
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.projects/hew_dev/.markers.snap
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	workspace_develop/.metadata/.plugins/org.eclipse.core.resources/.snap
	workspace_develop/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	workspace_develop/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	workspace_develop/.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps
	workspace_develop/.metadata/.plugins/org.eclipse.wst.jsdt.core/variablesAndContainers.dat
	workspace_develop/hew_dev/WebContent/test2.html