Issue #103
Merge branch 'master' of git://github.com/2ga/exp1
Issue #104
Merge pull request #59 from hiroto-exp2/master

#103
Merge branch 'master' of git://github.com/2ga/exp1

Conflicts:
	test2.php
	test3.php