Test2
Merge pull request #3 from hiroto-exp/master

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

Conflicts:
	test1.php