commit
Merge branch 'master' of https://github.com/tsubaki/pluginsSample

Conflicts:
	.gitignore