Windowsとのマージ
Merge branch 'master' of https://github.com/seriwb/palpunte.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs
Merge branch 'master' of https://github.com/seriwb/palpunte.git
解析追加