hoge
Merge branch 'master' of https://github.com/hirotakagi/M2C

Conflicts:
	.gitignore
	package.json