Add tokuhisa
Merge branch 'master' into tokuhisa
Change shared
Merge branch 'master' into tokuhisa

Conflicts:
	shared
Merge remote-tracking branch 'origin/master' into tokuhisa

Conflicts:
	shared
Merge pull request #2 from white-chocolate/tokuhisa

Tokuhisa