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

Conflicts:
	gulpfile.js
	nw-src/lib/js/.niichrome-util2ch.js.swp
	nw-src/lib/js/niichrome-updatechecker.js~
	nw-src/lib/js/niichrome-util2ch.js~
	package.json